proresdec: Fix end condition
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 22 May 2013 17:44:12 +0000 (19:44 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 22 May 2013 18:24:50 +0000 (20:24 +0200)
Fixes out of array writes
No FFmpeg release is affected by this

This also fixes some artifacts

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/proresdec2.c
libavcodec/proresdec_lgpl.c
tests/ref/fate/prores-transparency

index 374c5cb..5037bb8 100644 (file)
@@ -458,7 +458,7 @@ static void unpack_alpha(GetBitContext *gb, uint16_t *dst, int num_coeffs,
             } else {
                 dst[idx++] = (alpha_val << 2) | (alpha_val >> 6);
             }
-            if (idx == num_coeffs - 1)
+            if (idx >= num_coeffs)
                 break;
         } while (get_bits_left(gb)>0 && get_bits1(gb));
         val = get_bits(gb, 4);
index 73a1f6c..5e98d55 100644 (file)
@@ -496,7 +496,7 @@ static void unpack_alpha(GetBitContext *gb, uint16_t *dst, int num_coeffs,
                 dst[idx++] = alpha_val >> 6;
             else
                 dst[idx++] = (alpha_val << 2) | (alpha_val >> 6);
-            if (idx == num_coeffs - 1)
+            if (idx >= num_coeffs)
                 break;
         } while (get_bits1(gb));
         val = get_bits(gb, 4);
index 3842970..9c71d33 100644 (file)
@@ -1,5 +1,5 @@
 #tb 0: 1/25
 #tb 1: 1/48000
-0,          0,          0,        1, 16588800, 0x87f98f3c
+0,          0,          0,        1, 16588800, 0x20778f5e
 1,          0,          0,     1024,     4096, 0x00000000
 1,       1024,       1024,      896,     3584, 0x00000000