From: Michael Niedermayer <michaelni@gmx.at>
Date: Fri, 2 Jul 2010 23:39:02 +0000 (+0000)
Subject: Disable dshow specific bug emulation for amv files as they arent
X-Git-Tag: v0.7b1~3379
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=9862f9e149a20cca676b00dde0e01a73eda87ee0;p=platform%2Fupstream%2Flibav.git

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
---

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;