[SCM] libav/experimental: Fix msgsm in wav, do not set blkalign to frame size, this is wrong, all samples have correct blkalign set to 65

[siretart at users.alioth.debian.org]

The following commit has been merged in the experimental branch:
commit 52cf395407e8d6380a74ab793c7596c1db1bea6e
Author: Baptiste Coudurier <baptiste.coudurier at gmail.com>
Date:   Thu Sep 4 23:19:53 2008 +0000

    Fix msgsm in wav, do not set blkalign to frame size, this is wrong,
    all samples have correct blkalign set to 65
    
    Originally committed as revision 15209 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavformat/riff.c b/libavformat/riff.c
index 8ad2815..427bb3f 100644
--- a/libavformat/riff.c
+++ b/libavformat/riff.c
@@ -265,7 +265,7 @@ int put_wav_header(ByteIOContext *pb, AVCodecContext *enc)
         av_log(enc, AV_LOG_WARNING, "requested bits_per_sample (%d) and actually stored (%d) differ\n", enc->bits_per_sample, bps);
     }
 
-    if (enc->codec_id == CODEC_ID_MP2 || enc->codec_id == CODEC_ID_MP3 || enc->codec_id == CODEC_ID_GSM_MS || enc->codec_id == CODEC_ID_AC3) {
+    if (enc->codec_id == CODEC_ID_MP2 || enc->codec_id == CODEC_ID_MP3 || enc->codec_id == CODEC_ID_AC3) {
         blkalign = enc->frame_size; //this is wrong, but it seems many demuxers do not work if this is set correctly
         //blkalign = 144 * enc->bit_rate/enc->sample_rate;
     } else if (enc->codec_id == CODEC_ID_ADPCM_G726) { //

-- 
Libav/FFmpeg packaging