diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-03-17 21:08:12 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-03-17 21:09:43 +0100 |
| commit | 07ca090e814e3f93680fdef555f3688822a0cdbd (patch) | |
| tree | 2122164ce4e0f81e613ce48838de4bea261ef43d /libavformat | |
| parent | de732a82b618680743375cad4bd88668ee871abd (diff) | |
| parent | 4326bc364b58e97fc3d89417054a6b7610179a00 (diff) | |
| download | ffmpeg-07ca090e814e3f93680fdef555f3688822a0cdbd.tar.gz | |
Merge commit '4326bc364b58e97fc3d89417054a6b7610179a00'
* commit '4326bc364b58e97fc3d89417054a6b7610179a00':
lavf: Do not list mov-only codecs in riff tags
Conflicts:
libavformat/Makefile
libavformat/avidec.c
See: 2e0b5f5c90a4bc1440703ba5e8bf7139ff42f367
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat')
| -rw-r--r-- | libavformat/Makefile | 2 | ||||
| -rw-r--r-- | libavformat/avidec.c | 11 |
2 files changed, 9 insertions, 4 deletions
diff --git a/libavformat/Makefile b/libavformat/Makefile index 79df1c5471..2118ff22a8 100644 --- a/libavformat/Makefile +++ b/libavformat/Makefile @@ -90,7 +90,7 @@ OBJS-$(CONFIG_AST_DEMUXER) += ast.o astdec.o OBJS-$(CONFIG_AST_MUXER) += ast.o astenc.o OBJS-$(CONFIG_AU_DEMUXER) += au.o pcm.o OBJS-$(CONFIG_AU_MUXER) += au.o rawenc.o -OBJS-$(CONFIG_AVI_DEMUXER) += avidec.o +OBJS-$(CONFIG_AVI_DEMUXER) += avidec.o isom.o OBJS-$(CONFIG_AVI_MUXER) += avienc.o mpegtsenc.o avlanguage.o OBJS-$(CONFIG_AVISYNTH) += avisynth.o OBJS-$(CONFIG_AVM2_MUXER) += swfenc.o swf.o diff --git a/libavformat/avidec.c b/libavformat/avidec.c index 755fe58d97..73c1817150 100644 --- a/libavformat/avidec.c +++ b/libavformat/avidec.c @@ -775,11 +775,16 @@ static int avi_read_header(AVFormatContext *s) st->codec->codec_tag = tag1; st->codec->codec_id = ff_codec_get_id(ff_codec_bmp_tags, tag1); + /* If codec is not found yet, try with the mov tags. */ if (!st->codec->codec_id) { - st->codec->codec_id = ff_codec_get_id(ff_codec_movvideo_tags, - tag1); + char tag_buf[32]; + av_get_codec_tag_string(tag_buf, sizeof(tag_buf), tag1); + st->codec->codec_id = + ff_codec_get_id(ff_codec_movvideo_tags, tag1); if (st->codec->codec_id) - av_log(s, AV_LOG_WARNING, "mov tag found in avi\n"); + av_log(s, AV_LOG_WARNING, + "mov tag found in avi (fourcc %s)\n", + tag_buf); } /* This is needed to get the pict type which is necessary * for generating correct pts. */ |