Mercurial > libavcodec.hg

changeset 6787:d24da66bec76 libavcodec

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Set and use h->mb_xy in SVQ3 too.
author astrange
date Sun, 11 May 2008 20:26:35 +0000
parents 18084aaa277b
children e1302edb0f69
files svq3.c
diffstat 1 files changed, 4 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/svq3.c	Sun May 11 20:06:03 2008 +0000
+++ b/svq3.c	Sun May 11 20:26:35 2008 +0000
@@ -411,7 +411,7 @@
   uint32_t vlc;
   int8_t *top, *left;
   MpegEncContext *const s = (MpegEncContext *) h;
-  const int mb_xy = s->mb_x + s->mb_y*s->mb_stride;
+  const int mb_xy = h->mb_xy;
   const int b_xy = 4*s->mb_x + 4*s->mb_y*h->b_stride;
 
   h->top_samples_available        = (s->mb_y == 0) ? 0x33FF : 0xFFFF;
@@ -681,9 +681,11 @@
 
 static int svq3_decode_slice_header (H264Context *h) {
   MpegEncContext *const s = (MpegEncContext *) h;
-  const int mb_xy = s->mb_x + s->mb_y*s->mb_stride;
+  int mb_xy;
   int i, header;
 
+  mb_xy = h->mb_xy = s->mb_x + s->mb_y*s->mb_stride;
+
   header = get_bits (&s->gb, 8);
 
   if (((header & 0x9F) != 1 && (header & 0x9F) != 2) || (header & 0x60) == 0) {