Commit 0c19f5e7 authored by conrad's avatar conrad

Really fix 2.95

git-svn-id: file:///var/local/repositories/ffmpeg/trunk@22204 9553f0bf-9b14-0410-a0b8-cfaf0461ba5b
parent 3bf03369
...@@ -456,6 +456,7 @@ static void init_loop_filter(Vp3DecodeContext *s) ...@@ -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) ...@@ -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;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment