[FFmpeg-cvslog] r15209 - trunk/libavformat/riff.c

[bcoudurier]

Author: bcoudurier
Date: Fri Sep  5 01:19:53 2008
New Revision: 15209

Log:
Fix msgsm in wav, do not set blkalign to frame size, this is wrong,
all samples have correct blkalign set to 65


Modified:
   trunk/libavformat/riff.c

Modified: trunk/libavformat/riff.c
==============================================================================
--- trunk/libavformat/riff.c	(original)
+++ trunk/libavformat/riff.c	Fri Sep  5 01:19:53 2008
@@ -265,7 +265,7 @@ int put_wav_header(ByteIOContext *pb, AV
         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) { //