diff options
| -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. */ |