OSDN Git Service
(root)
/
android-x86
/
external-ffmpeg.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
35596bd
)
wavpack: don't set sample format in init.
author
Anton Khirnov
<anton@khirnov.net>
Sun, 26 May 2013 09:02:51 +0000
(11:02 +0200)
committer
Anton Khirnov
<anton@khirnov.net>
Tue, 28 May 2013 06:04:07 +0000
(08:04 +0200)
We don't know whether it will be float until we look at the data.
libavcodec/wavpack.c
patch
|
blob
|
history
diff --git
a/libavcodec/wavpack.c
b/libavcodec/wavpack.c
index
44cedd5
..
1b2e62e
100644
(file)
--- 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;