[FFmpeg-cvslog] lavf: use the format context strict_std_compliance instead of the codec one
Anton Khirnov
git at videolan.org
Thu Nov 6 13:18:18 CET 2014
ffmpeg | branch: master | Anton Khirnov <anton at khirnov.net> | Sat Jul 5 09:56:16 2014 +0000| [91e8d2eb1f7bf3af949008b106ec1ca037b88b0e] | committer: Anton Khirnov
lavf: use the format context strict_std_compliance instead of the codec one
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=91e8d2eb1f7bf3af949008b106ec1ca037b88b0e
---
libavformat/movenc.c | 2 +-
libavformat/mux.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/libavformat/movenc.c b/libavformat/movenc.c
index 80a44cf..c6c683f 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 4067c16..c80eb5b 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;
}
More information about the ffmpeg-cvslog
mailing list