lavf: use the format context strict_std_compliance instead of the codec one
authorAnton Khirnov <anton@khirnov.net>
Sat, 5 Jul 2014 09:56:16 +0000 (09:56 +0000)
committerAnton Khirnov <anton@khirnov.net>
Thu, 6 Nov 2014 08:01:49 +0000 (09:01 +0100)
libavformat/movenc.c
libavformat/mux.c

index 80a44cf..c6c683f 100644 (file)
@@ -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 ||
index 4067c16..c80eb5b 100644 (file)
@@ -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;
 }