aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec
diff options
context:
space:
mode:
authorAndreas Cadhalpun <andreas.cadhalpun@googlemail.com>2015-04-22 16:03:41 +0200
committerMichael Niedermayer <michaelni@gmx.at>2015-05-06 17:10:54 +0200
commite93c46b3ccc1f30cd14bac6f3e4f6e4a831559c1 (patch)
tree451f8057f2d21042356602e2d4f916f399895342 /libavcodec
parent0756fa87bffd24a71d034e634d05ad14c2d81e4a (diff)
downloadffmpeg-e93c46b3ccc1f30cd14bac6f3e4f6e4a831559c1.tar.gz
alsdec: only adapt order for positive max_order
For max_order = 0 the clipping range is invalid. (amin = 2, amax = 1) Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit 58d605ee9b3277289278dc40e022311f8e083833) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec')
-rw-r--r--libavcodec/alsdec.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/alsdec.c b/libavcodec/alsdec.c
index 1cd55ea923..b5e748dee6 100644
--- a/libavcodec/alsdec.c
+++ b/libavcodec/alsdec.c
@@ -680,7 +680,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);