ape: Support _0000 files with nblock smaller than 64

Message ID 20150510150250.D775D31@aruru.libav.org
State New
Headers show

Commit Message

Janne Grunau May 10, 2015, 3:02 p.m.
Module: libav
Branch: master
Commit: 295e05a762332c5edcc84c325e94457815a51b5c

Author:    Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
Committer: Luca Barbato <lu_zero@gentoo.org>
Date:      Wed Apr 29 20:39:22 2015 +0200

ape: Support _0000 files with nblock smaller than 64

The decode_array_0000 assumed that 64 is the minimal block size
while it is not.

CC: libav-stable@libav.org
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>

---

 libavcodec/apedec.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Patch

diff --git a/libavcodec/apedec.c b/libavcodec/apedec.c
index 344c85b..131c6f3 100644
--- a/libavcodec/apedec.c
+++ b/libavcodec/apedec.c
@@ -614,12 +614,12 @@  static void decode_array_0000(APEContext *ctx, GetBitContext *gb,
     int ksummax, ksummin;
 
     rice->ksum = 0;
-    for (i = 0; i < 5; i++) {
+    for (i = 0; i < FFMIN(blockstodecode, 5); i++) {
         out[i] = get_rice_ook(&ctx->gb, 10);
         rice->ksum += out[i];
     }
     rice->k = av_log2(rice->ksum / 10) + 1;
-    for (; i < 64; i++) {
+    for (; i < FFMIN(blockstodecode, 64); i++) {
         out[i] = get_rice_ook(&ctx->gb, rice->k);
         rice->ksum += out[i];
         rice->k = av_log2(rice->ksum / ((i + 1) * 2)) + 1;