From 5b77a81a8dbe277d5e00a1723d5f7186a8528d82 Mon Sep 17 00:00:00 2001 From: Michel Bardiaux Date: Tue, 20 Feb 2007 14:31:43 +0000 Subject: [PATCH] Remove code duplicated between adpcm.c and riff.c Originally committed as revision 8042 to svn://svn.ffmpeg.org/ffmpeg/trunk --- libavformat/riff.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavformat/riff.c b/libavformat/riff.c index ffa3556..0a2a77c 100644 --- a/libavformat/riff.c +++ b/libavformat/riff.c @@ -364,7 +364,7 @@ int put_wav_header(ByteIOContext *pb, AVCodecContext *enc) } else if (enc->codec_id == CODEC_ID_ADPCM_IMA_WAV) { put_le16(pb, 2); /* wav_extra_size */ hdrsize += 2; - put_le16(pb, ((enc->block_align - 4 * enc->channels) / (4 * enc->channels)) * 8 + 1); /* wSamplesPerBlock */ + put_le16(pb, enc->frame_size); /* wSamplesPerBlock */ } else if(enc->extradata_size){ put_le16(pb, enc->extradata_size); put_buffer(pb, enc->extradata, enc->extradata_size); -- 2.7.4