diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-05-28 11:41:33 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-05-28 11:41:38 +0200 |
| commit | aa6cf4c1b050a387f99c1545a8f8029095da1cce (patch) | |
| tree | 8668d447c0aaecd16fb17b75600401f5a5c08d9b /libavcodec | |
| parent | 288e3fdfd3ab65ad871377be53a9651e3faa7ef6 (diff) | |
| parent | 72dee5f40b236c5eb9e68df39df80c68392269e3 (diff) | |
| download | ffmpeg-aa6cf4c1b050a387f99c1545a8f8029095da1cce.tar.gz | |
Merge commit '72dee5f40b236c5eb9e68df39df80c68392269e3'
* commit '72dee5f40b236c5eb9e68df39df80c68392269e3':
wavpack: don't set sample format in init.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/wavpack.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/libavcodec/wavpack.c b/libavcodec/wavpack.c index 7eb8ea82eb..3eba4b39a2 100644 --- 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; |