summaryrefslogtreecommitdiff
path: root/libavcodec
diff options
context:
space:
mode:
authorDavid Conrad <lessen42@gmail.com>2010-03-04 10:01:03 +0000
committerDavid Conrad <lessen42@gmail.com>2010-03-04 10:01:03 +0000
commite2720b6b1e868f469d5a6b3b29f7fa26c75d34be (patch)
tree15935f1f054d9e6c2ae75e87a92c558e88b8195e /libavcodec
parent0448ef7788622f57f00d089c9138e2f594c9d246 (diff)
Really fix 2.95
Originally committed as revision 22204 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec')
-rw-r--r--libavcodec/vp3.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/libavcodec/vp3.c b/libavcodec/vp3.c
index 970bfee099..170896fedd 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;