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:
94bb1ce
)
alsdec: only adapt order for positive max_order
author
Andreas Cadhalpun
<andreas.cadhalpun@googlemail.com>
Wed, 22 Apr 2015 14:03:41 +0000
(16:03 +0200)
committer
Anton Khirnov
<anton@khirnov.net>
Tue, 5 May 2015 14:10:52 +0000
(16:10 +0200)
For max_order = 0 the clipping range is invalid. (amin = 2, amax = 1)
CC: libav-stable@libav.org
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
Signed-off-by: Anton Khirnov <anton@khirnov.net>
libavcodec/alsdec.c
patch
|
blob
|
history
diff --git
a/libavcodec/alsdec.c
b/libavcodec/alsdec.c
index
a5452c3
..
1ade656
100644
(file)
--- a/
libavcodec/alsdec.c
+++ b/
libavcodec/alsdec.c
@@
-663,7
+663,7
@@
static int read_var_block_data(ALSDecContext *ctx, ALSBlockData *bd)
if (!sconf->rlslms) {
- if (sconf->adapt_order) {
+ if (sconf->adapt_order
&& sconf->max_order
) {
int opt_order_length = av_ceil_log2(av_clip((bd->block_length >> 3) - 1,
2, sconf->max_order + 1));
*bd->opt_order = get_bits(gb, opt_order_length);