Browse Source

Really fix 2.95

Originally committed as revision 22204 to svn://svn.ffmpeg.org/ffmpeg/trunk
David Conrad 15 years ago
parent
commit
e2720b6b1e
1 changed files with 2 additions and 1 deletions
  1. 2 1
      libavcodec/vp3.c

+ 2 - 1
libavcodec/vp3.c

@@ -456,6 +456,7 @@ static void init_loop_filter(Vp3DecodeContext *s)
  */
  */
 static int unpack_superblocks(Vp3DecodeContext *s, GetBitContext *gb)
 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 bit = 0;
     int current_superblock = 0;
     int current_superblock = 0;
     int current_run = 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);
     memset(s->macroblock_coding, MODE_COPY, s->macroblock_count);
 
 
     for (plane = 0; plane < 3; plane++) {
     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 sb_end = sb_start + (plane ? s->c_superblock_count : s->y_superblock_count);
         int num_coded_frags = 0;
         int num_coded_frags = 0;