[FFmpeg-cvslog] r21806 - trunk/libavcodec/h264.h

[michael]

Author: michael
Date: Sat Feb 13 20:00:51 2010
New Revision: 21806

Log:
Move more code under if(!IS_DIRECT(mb_type)).

Modified:
   trunk/libavcodec/h264.h

Modified: trunk/libavcodec/h264.h
==============================================================================
--- trunk/libavcodec/h264.h	Sat Feb 13 19:59:25 2010	(r21805)
+++ trunk/libavcodec/h264.h	Sat Feb 13 20:00:51 2010	(r21806)
@@ -1015,6 +1015,7 @@ static void fill_decode_caches(H264Conte
             if((IS_SKIP(mb_type) || IS_DIRECT(mb_type)) && !FRAME_MBAFF)
                 continue;
 
+            if(!IS_DIRECT(mb_type)) {
             h->ref_cache[list][scan8[5 ]+1] =
             h->ref_cache[list][scan8[7 ]+1] =
             h->ref_cache[list][scan8[13]+1] =  //FIXME remove past 3 (init somewhere else)
@@ -1026,7 +1027,7 @@ static void fill_decode_caches(H264Conte
             *(uint32_t*)h->mv_cache [list][scan8[4 ]]=
             *(uint32_t*)h->mv_cache [list][scan8[12]]= 0;
 
-            if( CABAC && !IS_DIRECT(mb_type)) {
+            if( CABAC ) {
                 /* XXX beurk, Load mvd */
                 if(USES_LIST(top_type, list)){
                     const int b_xy= h->mb2b_xy[top_xy] + 3*h->b_stride;
@@ -1084,7 +1085,7 @@ static void fill_decode_caches(H264Conte
                         h->direct_cache[scan8[0] - 1 + 2*8]= 0;
                 }
             }
-
+            }
             if(FRAME_MBAFF){
 #define MAP_MVS\
                     MAP_F2F(scan8[0] - 1 - 1*8, topleft_type)\