diff options
| -rw-r--r-- | libavcodec/wavpack.c | 16 |
1 files changed, 2 insertions, 14 deletions
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; |