wavpack: drop redundant if/else blocks

pull/23/head
Anton Khirnov 12 years ago
parent 7b44c99180
commit a7ec3a9a4e
  1. 16
      libavcodec/wavpack.c

@ -1125,13 +1125,7 @@ static int wavpack_decode_block(AVCodecContext *avctx, int block_no,
}
if (s->stereo_in) {
if (avctx->sample_fmt == AV_SAMPLE_FMT_S16)
samplecount = wv_unpack_stereo(s, &s->gb, samples, AV_SAMPLE_FMT_S16);
else if (avctx->sample_fmt == AV_SAMPLE_FMT_S32)
samplecount = wv_unpack_stereo(s, &s->gb, samples, AV_SAMPLE_FMT_S32);
else
samplecount = wv_unpack_stereo(s, &s->gb, samples, AV_SAMPLE_FMT_FLT);
samplecount = wv_unpack_stereo(s, &s->gb, samples, avctx->sample_fmt);
if (samplecount < 0)
return samplecount;
@ -1139,13 +1133,7 @@ static int wavpack_decode_block(AVCodecContext *avctx, int block_no,
} else {
const int channel_stride = avctx->channels;
if (avctx->sample_fmt == AV_SAMPLE_FMT_S16)
samplecount = wv_unpack_mono(s, &s->gb, samples, AV_SAMPLE_FMT_S16);
else if (avctx->sample_fmt == AV_SAMPLE_FMT_S32)
samplecount = wv_unpack_mono(s, &s->gb, samples, AV_SAMPLE_FMT_S32);
else
samplecount = wv_unpack_mono(s, &s->gb, samples, AV_SAMPLE_FMT_FLT);
samplecount = wv_unpack_mono(s, &s->gb, samples, avctx->sample_fmt);
if (samplecount < 0)
return samplecount;

Loading…
Cancel
Save