From a7ec3a9a4eea4e374afcd6e05828b103e6fcb601 Mon Sep 17 00:00:00 2001 From: Anton Khirnov Date: Sat, 25 May 2013 07:49:25 +0200 Subject: wavpack: drop redundant if/else blocks --- libavcodec/wavpack.c | 16 ++-------------- 1 file changed, 2 insertions(+), 14 deletions(-) (limited to 'libavcodec/wavpack.c') diff --git a/libavcodec/wavpack.c b/libavcodec/wavpack.c index 7136e7aa16..4349ccb954 100644 --- a/libavcodec/wavpack.c +++ b/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; -- cgit v1.2.3