diff mpeg12.c @ 10177:981143737752 libavcodec

Move down HWAccel code path so that to fill in s->mb_x first.
author gb
date Wed, 16 Sep 2009 07:49:08 +0000
parents a37ffec2074c
children 59ec306245a4
line wrap: on
line diff
--- a/mpeg12.c	Tue Sep 15 23:14:55 2009 +0000
+++ b/mpeg12.c	Wed Sep 16 07:49:08 2009 +0000
@@ -1714,19 +1714,6 @@
 
     s->mb_x=0;
 
-    if (avctx->hwaccel) {
-        const uint8_t *buf_end, *buf_start = *buf - 4; /* include start_code */
-        int start_code = -1;
-        buf_end = ff_find_start_code(buf_start + 2, *buf + buf_size, &start_code);
-        if (buf_end < *buf + buf_size)
-            buf_end -= 4;
-        s->mb_y = mb_y;
-        if (avctx->hwaccel->decode_slice(avctx, buf_start, buf_end - buf_start) < 0)
-            return DECODE_SLICE_ERROR;
-        *buf = buf_end;
-        return DECODE_SLICE_OK;
-    }
-
     for(;;) {
         int code = get_vlc2(&s->gb, mbincr_vlc.table, MBINCR_VLC_BITS, 2);
         if (code < 0){
@@ -1748,6 +1735,19 @@
         return -1;
     }
 
+    if (avctx->hwaccel) {
+        const uint8_t *buf_end, *buf_start = *buf - 4; /* include start_code */
+        int start_code = -1;
+        buf_end = ff_find_start_code(buf_start + 2, *buf + buf_size, &start_code);
+        if (buf_end < *buf + buf_size)
+            buf_end -= 4;
+        s->mb_y = mb_y;
+        if (avctx->hwaccel->decode_slice(avctx, buf_start, buf_end - buf_start) < 0)
+            return DECODE_SLICE_ERROR;
+        *buf = buf_end;
+        return DECODE_SLICE_OK;
+    }
+
     s->resync_mb_x= s->mb_x;
     s->resync_mb_y= s->mb_y= mb_y;
     s->mb_skip_run= 0;