Merge commit '72dee5f40b236c5eb9e68df39df80c68392269e3'

* commit '72dee5f40b236c5eb9e68df39df80c68392269e3': wavpack: don't set sample format in init. Merged-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago · aa6cf4c1b0
parent 288e3fdfd3 72dee5f40b
commit aa6cf4c1b0
1 changed files with 1 additions and 4 deletions
--- a/libavcodec/wavpack.c
+++ b/libavcodec/wavpack.c
@ -722,10 +722,7 @@ static av_cold int wavpack_decode_init(AVCodecContext *avctx)
    WavpackContext *s = avctx->priv_data;

    s->avctx = avctx;
-    if (avctx->bits_per_coded_sample <= 16)
-        avctx->sample_fmt = AV_SAMPLE_FMT_S16P;
-    else
-        avctx->sample_fmt = AV_SAMPLE_FMT_S32P;
+
    if (avctx->channels <= 2 && !avctx->channel_layout)
        avctx->channel_layout = (avctx->channels == 2) ? AV_CH_LAYOUT_STEREO
                                                       : AV_CH_LAYOUT_MONO;