virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-15 14:13:16 +02:00
Code Issues Releases Activity

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

Browse Source
This commit is contained in:
Anton Khirnov
2014-07-05 09:56:16 +00:00
parent 2f3fadfbe3
commit 91e8d2eb1f
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
libavformat/movenc.c
View File

@@ -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 ||

2
libavformat/mux.c
View File

@@ -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;
} }