[Ffmpeg-cvslog] r8042 - trunk/libavformat/riff.c

[mbardiaux]

Author: mbardiaux
Date: Tue Feb 20 15:31:43 2007
New Revision: 8042

Modified:
   trunk/libavformat/riff.c

Log:
Remove code duplicated between adpcm.c and riff.c


Modified: trunk/libavformat/riff.c
==============================================================================
--- trunk/libavformat/riff.c	(original)
+++ trunk/libavformat/riff.c	Tue Feb 20 15:31:43 2007
@@ -364,7 +364,7 @@
     } 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);