From e2720b6b1e868f469d5a6b3b29f7fa26c75d34be Mon Sep 17 00:00:00 2001
From: David Conrad <lessen42@gmail.com>
Date: Thu, 4 Mar 2010 10:01:03 +0000
Subject: [PATCH] Really fix 2.95
Originally committed as revision 22204 to svn://svn.ffmpeg.org/ffmpeg/trunk
---
libavcodec/vp3.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/libavcodec/vp3.c b/libavcodec/vp3.c
index 970bfee099e..170896fedda 100644
--- a/libavcodec/vp3.c
+++ b/libavcodec/vp3.c
@@ -456,6 +456,7 @@ static void init_loop_filter(Vp3DecodeContext *s)
*/
static int unpack_superblocks(Vp3DecodeContext *s, GetBitContext *gb)
{
+ int superblock_starts[3] = { 0, s->u_superblock_start, s->v_superblock_start };
int bit = 0;
int current_superblock = 0;
int current_run = 0;
@@ -547,7 +548,7 @@ static int unpack_superblocks(Vp3DecodeContext *s, GetBitContext *gb)
memset(s->macroblock_coding, MODE_COPY, s->macroblock_count);
for (plane = 0; plane < 3; plane++) {
- int sb_start = (int[3]){ 0, s->u_superblock_start, s->v_superblock_start }[plane];
+ int sb_start = superblock_starts[plane];
int sb_end = sb_start + (plane ? s->c_superblock_count : s->y_superblock_count);
int num_coded_frags = 0;
--
GitLab