[FFmpeg-cvslog] wavpack: don't set sample format in init.
Anton Khirnov
git at videolan.org
Tue May 28 11:47:01 CEST 2013
ffmpeg | branch: master | Anton Khirnov <anton at khirnov.net> | Sun May 26 11:02:51 2013 +0200| [72dee5f40b236c5eb9e68df39df80c68392269e3] | committer: Anton Khirnov
wavpack: don't set sample format in init.
We don't know whether it will be float until we look at the data.
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=72dee5f40b236c5eb9e68df39df80c68392269e3
---
libavcodec/wavpack.c | 5 +----
1 file changed, 1 insertion(+), 4 deletions(-)
diff --git a/libavcodec/wavpack.c b/libavcodec/wavpack.c
index 44cedd5..1b2e62e 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;
More information about the ffmpeg-cvslog
mailing list