From: Zhentan Feng <spyfeng@gmail.com>
Date: Wed, 8 Apr 2009 16:01:10 +0000 (+0000)
Subject: Reduce code duplication.
X-Git-Tag: v0.6~4885
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=c81604f862a550bef5261680cfdc48deb6fce046;p=coroid%2Flibav_saccubus.git

Reduce code duplication.

Patch by Zhentan Feng, spyfeng gmail

Originally committed as revision 18377 to svn://svn.ffmpeg.org/ffmpeg/trunk
---

diff --git a/libavformat/riff.c b/libavformat/riff.c
index aa33c097c..3665176f4 100644
--- a/libavformat/riff.c
+++ b/libavformat/riff.c
@@ -352,10 +352,7 @@ int put_wav_header(ByteIOContext *pb, AVCodecContext *enc)
         bytestream_put_le16(&riff_extradata, 16);                         /* fwHeadFlags */
         bytestream_put_le32(&riff_extradata, 0);                          /* dwPTSLow */
         bytestream_put_le32(&riff_extradata, 0);                          /* dwPTSHigh */
-    } else if (enc->codec_id == CODEC_ID_GSM_MS) {
-        hdrsize += 2;
-        bytestream_put_le16(&riff_extradata, enc->frame_size); /* wSamplesPerBlock */
-    } else if (enc->codec_id == CODEC_ID_ADPCM_IMA_WAV) {
+    } else if (enc->codec_id == CODEC_ID_GSM_MS || enc->codec_id == CODEC_ID_ADPCM_IMA_WAV) {
         hdrsize += 2;
         bytestream_put_le16(&riff_extradata, enc->frame_size); /* wSamplesPerBlock */
     } else if(enc->extradata_size){