From: Anton Khirnov Date: Sun, 26 May 2013 09:02:51 +0000 (+0200) Subject: wavpack: don't set sample format in init. X-Git-Tag: n2.0~26^2~232 X-Git-Url: http://git.videolan.org/?p=ffmpeg.git;a=commitdiff_plain;h=72dee5f40b236c5eb9e68df39df80c68392269e3 wavpack: don't set sample format in init. We don't know whether it will be float until we look at the data. --- diff --git a/libavcodec/wavpack.c b/libavcodec/wavpack.c index 44cedd5e75..1b2e62ef4f 100644 --- a/libavcodec/wavpack.c +++ b/libavcodec/wavpack.c @@ -716,10 +716,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;