diff options
| author | Anton Khirnov <anton@khirnov.net> | 2014-11-14 15:11:09 +0100 |
|---|---|---|
| committer | Anton Khirnov <anton@khirnov.net> | 2015-01-27 09:13:45 +0100 |
| commit | f771b3ab5d3c0b763ee356152be550f4121babd0 (patch) | |
| tree | 940da7edf98d4707cc8470d3c03d7262853c9da7 /libavcodec | |
| parent | 167e004e1aca7765686ed95d7cd8ea5064d4f6f6 (diff) | |
| download | ffmpeg-f771b3ab5d3c0b763ee356152be550f4121babd0.tar.gz | |
avidec: do not export stream_codec_tag
Handle its only existing use case internally.
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/mpeg4videodec.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/libavcodec/mpeg4videodec.c b/libavcodec/mpeg4videodec.c index ff3782647d..0966e07d5c 100644 --- a/libavcodec/mpeg4videodec.c +++ b/libavcodec/mpeg4videodec.c @@ -2047,8 +2047,7 @@ static int decode_user_data(Mpeg4DecContext *ctx, GetBitContext *gb) ctx->xvid_build = build; if (ctx->xvid_build == -1 && ctx->divx_version == -1 && ctx->lavc_build == -1) { - if (s->stream_codec_tag == AV_RL32("XVID") || - s->codec_tag == AV_RL32("XVID") || + if (s->codec_tag == AV_RL32("XVID") || s->codec_tag == AV_RL32("XVIX") || s->codec_tag == AV_RL32("RMP4") || s->codec_tag == AV_RL32("ZMP4") || |