Commit 91e8d2eb authored by Anton Khirnov's avatar Anton Khirnov

lavf: use the format context strict_std_compliance instead of the codec one

parent 2f3fadfb
...@@ -881,7 +881,7 @@ static int mov_get_codec_tag(AVFormatContext *s, MOVTrack *track) ...@@ -881,7 +881,7 @@ static int mov_get_codec_tag(AVFormatContext *s, MOVTrack *track)
{ {
int tag = track->enc->codec_tag; 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_DVVIDEO ||
track->enc->codec_id == AV_CODEC_ID_RAWVIDEO || track->enc->codec_id == AV_CODEC_ID_RAWVIDEO ||
track->enc->codec_id == AV_CODEC_ID_H263 || track->enc->codec_id == AV_CODEC_ID_H263 ||
......
...@@ -79,7 +79,7 @@ static int validate_codec_tag(AVFormatContext *s, AVStream *st) ...@@ -79,7 +79,7 @@ static int validate_codec_tag(AVFormatContext *s, AVStream *st)
} }
if (id != AV_CODEC_ID_NONE) if (id != AV_CODEC_ID_NONE)
return 0; return 0;
if (tag && (st->codec->strict_std_compliance >= FF_COMPLIANCE_NORMAL)) if (tag && (s->strict_std_compliance >= FF_COMPLIANCE_NORMAL))
return 0; return 0;
return 1; return 1;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment