summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnton Khirnov <anton@khirnov.net>2014-07-05 09:56:16 +0000
committerAnton Khirnov <anton@khirnov.net>2014-11-06 09:01:49 +0100
commit91e8d2eb1f7bf3af949008b106ec1ca037b88b0e (patch)
tree251a765ee80bba2b7e214530e9d2fdd58fcb6391
parent2f3fadfbe3c6ad52fad5c614b6067c5401227959 (diff)
lavf: use the format context strict_std_compliance instead of the codec one
-rw-r--r--libavformat/movenc.c2
-rw-r--r--libavformat/mux.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/libavformat/movenc.c b/libavformat/movenc.c
index 80a44cf186..c6c683fe33 100644
--- a/libavformat/movenc.c
+++ b/libavformat/movenc.c
@@ -881,7 +881,7 @@ static int mov_get_codec_tag(AVFormatContext *s, MOVTrack *track)
{
int tag = track->enc->codec_tag;
- if (!tag || (track->enc->strict_std_compliance >= FF_COMPLIANCE_NORMAL &&
+ if (!tag || (s->strict_std_compliance >= FF_COMPLIANCE_NORMAL &&
(track->enc->codec_id == AV_CODEC_ID_DVVIDEO ||
track->enc->codec_id == AV_CODEC_ID_RAWVIDEO ||
track->enc->codec_id == AV_CODEC_ID_H263 ||
diff --git a/libavformat/mux.c b/libavformat/mux.c
index 4067c16bab..c80eb5bfb7 100644
--- a/libavformat/mux.c
+++ b/libavformat/mux.c
@@ -79,7 +79,7 @@ static int validate_codec_tag(AVFormatContext *s, AVStream *st)
}
if (id != AV_CODEC_ID_NONE)
return 0;
- if (tag && (st->codec->strict_std_compliance >= FF_COMPLIANCE_NORMAL))
+ if (tag && (s->strict_std_compliance >= FF_COMPLIANCE_NORMAL))
return 0;
return 1;
}