summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBaptiste Coudurier <baptiste.coudurier@gmail.com>2008-09-04 23:19:53 +0000
committerBaptiste Coudurier <baptiste.coudurier@gmail.com>2008-09-04 23:19:53 +0000
commit52cf395407e8d6380a74ab793c7596c1db1bea6e (patch)
tree6d1b96a50dc3733dde696fb5a90125514b75829b
parent78df225866418a59b933fe668bc514890e9747d2 (diff)
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
-rw-r--r--libavformat/riff.c2
1 files changed, 1 insertions, 1 deletions
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) { //