Hi,
fixes ticket #5297 reverting an old commit.
-Thilo
From 50f62f88696d1401d93c552d52fe1b9c396f8a00 Mon Sep 17 00:00:00 2001
From: Thilo Borgmann <thilo.borgm...@mail.de>
Date: Wed, 9 Nov 2016 20:00:02 +0100
Subject: [PATCH] lavc/alsdec: allow for predictor orders higher than block
length which is valid in ALS.
Reverts: 18f94df8af04f2c02a25a7dec512289feff6517f
Fixes ticket #5297
---
libavcodec/alsdec.c | 6 +-----
1 file changed, 1 insertion(+), 5 deletions(-)
diff --git a/libavcodec/alsdec.c b/libavcodec/alsdec.c
index 3986347..2b2273e 100644
--- a/libavcodec/alsdec.c
+++ b/libavcodec/alsdec.c
@@ -705,11 +705,7 @@ static int read_var_block_data(ALSDecContext *ctx,
ALSBlockData *bd)
} else {
*bd->opt_order = sconf->max_order;
}
- if (*bd->opt_order > bd->block_length) {
- *bd->opt_order = bd->block_length;
- av_log(avctx, AV_LOG_ERROR, "Predictor order too large.\n");
- return AVERROR_INVALIDDATA;
- }
+
opt_order = *bd->opt_order;
if (opt_order) {
--
1.8.3.2
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
