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:
1b5ec6a
)
wavpackenc: fix number of samples per block
author
Christophe Gisquet
<christophe.gisquet@gmail.com>
Fri, 22 Aug 2014 09:31:42 +0000
(09:31 +0000)
committer
Michael Niedermayer
<michaelni@gmx.at>
Fri, 22 Aug 2014 10:18:08 +0000
(12:18 +0200)
Currently, the encoder will try to reduce it down to 150000, but the
decoder will complain starting at 131072 (WV_MAX_SAMPLES). Therefore,
change the loop limit.
Fixes ticket #3881.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/wavpackenc.c
patch
|
blob
|
history
diff --git
a/libavcodec/wavpackenc.c
b/libavcodec/wavpackenc.c
index
3631a08
..
169836a
100644
(file)
--- a/
libavcodec/wavpackenc.c
+++ b/
libavcodec/wavpackenc.c
@@
-135,7
+135,7
@@
static av_cold int wavpack_encode_init(AVCodecContext *avctx)
else
block_samples = avctx->sample_rate;
- while (block_samples * avctx->channels >
150000
)
+ while (block_samples * avctx->channels >
WV_MAX_SAMPLES
)
block_samples /= 2;
while (block_samples * avctx->channels < 40000)