[SCM] libav/experimental: Disable dshow specific bug emulation for amv files as they arent demuxed by ms dshows buggy demuxer normally.

[siretart at users.alioth.debian.org]

The following commit has been merged in the experimental branch:
commit 9862f9e149a20cca676b00dde0e01a73eda87ee0
Author: Michael Niedermayer <michaelni at gmx.at>
Date:   Fri Jul 2 23:39:02 2010 +0000

    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;

-- 
Libav/FFmpeg packaging