changeset 11003:72c026446d67 libavcodec

100l, correct wrong H.264+adaptive MBAFF decoding Fixes several FATE tests.
author astrange
date Mon, 25 Jan 2010 01:56:13 +0000
parents 1c8892d7a090
children 1c3b1752d6d6
files h264.c
diffstat 1 files changed, 5 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/h264.c	Mon Jan 25 00:30:44 2010 +0000
+++ b/h264.c	Mon Jan 25 01:56:13 2010 +0000
@@ -987,8 +987,8 @@
     int deblock_top;
     int mb_xy;
     int top_idx = 1;
-    uint8_t *top_border_m1 = h->top_borders[top_idx][s->mb_x-1];
-    uint8_t *top_border    = h->top_borders[top_idx][s->mb_x];
+    uint8_t *top_border_m1;
+    uint8_t *top_border;
 
     if(!simple && FRAME_MBAFF){
         if(s->mb_y&1){
@@ -1012,6 +1012,9 @@
     src_cb -= uvlinesize + 1;
     src_cr -= uvlinesize + 1;
 
+    top_border_m1 = h->top_borders[top_idx][s->mb_x-1];
+    top_border    = h->top_borders[top_idx][s->mb_x];
+
 #define XCHG(a,b,xchg)\
 if (xchg) AV_SWAP64(b,a);\
 else      AV_COPY64(b,a);