From 9862f9e149a20cca676b00dde0e01a73eda87ee0 Mon Sep 17 00:00:00 2001 From: Michael Niedermayer Date: Fri, 2 Jul 2010 23:39:02 +0000 Subject: [PATCH] Disable dshow specific bug emulation for amv files as they arent demuxed by ms dshows buggy demuxer normally. Originally committed as revision 24012 to svn://svn.ffmpeg.org/ffmpeg/trunk --- libavformat/avidec.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/libavformat/avidec.c b/libavformat/avidec.c index ec24a6e..cdf8307 100644 --- a/libavformat/avidec.c +++ b/libavformat/avidec.c @@ -593,8 +593,10 @@ static int avi_read_header(AVFormatContext *s, AVFormatParameters *ap) st->codec->codec_id = CODEC_ID_XAN_DPCM; st->codec->codec_tag = 0; } - if (amv_file_format) + if (amv_file_format){ st->codec->codec_id = CODEC_ID_ADPCM_IMA_AMV; + ast->dshow_block_align = 0; + } break; default: st->codec->codec_type = AVMEDIA_TYPE_DATA; -- 2.7.4