[SCM] libav/experimental: Use block_align as the avi spec says. fix issue274

[siretart at users.alioth.debian.org]

The following commit has been merged in the experimental branch:
commit 78db672caeccd5e0af919ad188fbbae37c690624
Author: Michael Niedermayer <michaelni at gmx.at>
Date:   Mon Mar 3 01:27:15 2008 +0000

    Use block_align as the avi spec says.
    fix issue274
    
    Originally committed as revision 12296 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavformat/avidec.c b/libavformat/avidec.c
index 82acc2a..7634a95 100644
--- a/libavformat/avidec.c
+++ b/libavformat/avidec.c
@@ -488,8 +488,10 @@ static int avi_read_header(AVFormatContext *s, AVFormatParameters *ap)
                     break;
                 case CODEC_TYPE_AUDIO:
                     get_wav_header(pb, st->codec, size);
-                    if(ast->sample_size && st->codec->block_align && ast->sample_size != st->codec->block_align)
+                    if(ast->sample_size && st->codec->block_align && ast->sample_size != st->codec->block_align){
                         av_log(s, AV_LOG_WARNING, "sample size (%d) != block align (%d)\n", ast->sample_size, st->codec->block_align);
+                        ast->sample_size= st->codec->block_align;
+                    }
                     if (size%2) /* 2-aligned (fix for Stargate SG-1 - 3x18 - Shades of Grey.avi) */
                         url_fskip(pb, 1);
                     /* Force parsing as several audio frames can be in

-- 
Libav/FFmpeg packaging