diff options
| author | Michel Bardiaux <mbardiaux@mediaxim.be> | 2007-02-20 14:31:43 +0000 |
|---|---|---|
| committer | Michel Bardiaux <mbardiaux@mediaxim.be> | 2007-02-20 14:31:43 +0000 |
| commit | 5b77a81a8dbe277d5e00a1723d5f7186a8528d82 (patch) | |
| tree | b5e3cd8a7151778d399c3636e9e3131e31edd3d9 | |
| parent | 7ad731e99f421d8ce4fed379eaa23603df553736 (diff) | |
| download | ffmpeg-5b77a81a8dbe277d5e00a1723d5f7186a8528d82.tar.gz | |
Remove code duplicated between adpcm.c and riff.c
Originally committed as revision 8042 to svn://svn.ffmpeg.org/ffmpeg/trunk
| -rw-r--r-- | libavformat/riff.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavformat/riff.c b/libavformat/riff.c index ffa35566a9..0a2a77cb7c 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); |