From 52cf395407e8d6380a74ab793c7596c1db1bea6e Mon Sep 17 00:00:00 2001 From: Baptiste Coudurier Date: Thu, 4 Sep 2008 23:19:53 +0000 Subject: 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 --- libavformat/riff.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'libavformat/riff.c') diff --git a/libavformat/riff.c b/libavformat/riff.c index 8ad28159c4..427bb3ff79 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) { // -- cgit v1.2.3