[FFmpeg-cvslog] r21445 - trunk/libavcodec/h264.c

[astrange]

Author: astrange
Date: Mon Jan 25 02:56:13 2010
New Revision: 21445

Log:
100l, correct wrong H.264+adaptive MBAFF decoding

Fixes several FATE tests.

Modified:
   trunk/libavcodec/h264.c

Modified: trunk/libavcodec/h264.c
==============================================================================
--- trunk/libavcodec/h264.c	Mon Jan 25 02:34:48 2010	(r21444)
+++ trunk/libavcodec/h264.c	Mon Jan 25 02:56:13 2010	(r21445)
@@ -987,8 +987,8 @@ static inline void xchg_mb_border(H264Co
     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 @@ static inline void xchg_mb_border(H264Co
     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);