[FFmpeg-cvslog] r22071 - in trunk/libavcodec: h264.c h264.h

[michael]

Author: michael
Date: Fri Feb 26 04:27:52 2010
New Revision: 22071

Log:
Move init of right side of ref_cache from fill_caches() to init_the_darn_decoder().

Modified:
   trunk/libavcodec/h264.c
   trunk/libavcodec/h264.h

Modified: trunk/libavcodec/h264.c
==============================================================================
--- trunk/libavcodec/h264.c	Fri Feb 26 03:54:03 2010	(r22070)
+++ trunk/libavcodec/h264.c	Fri Feb 26 04:27:52 2010	(r22071)
@@ -872,6 +872,10 @@ av_cold int ff_h264_decode_init(AVCodecC
         avctx->ticks_per_frame = 2;
     }
 
+    h->ref_cache[0][scan8[5 ]+1] = h->ref_cache[0][scan8[7 ]+1] = h->ref_cache[0][scan8[13]+1] =
+    h->ref_cache[1][scan8[5 ]+1] = h->ref_cache[1][scan8[7 ]+1] = h->ref_cache[1][scan8[13]+1] = PART_NOT_AVAILABLE;
+
+
     if(avctx->extradata_size > 0 && avctx->extradata && *(char *)avctx->extradata == 1){
         int i, cnt, nalsize;
         unsigned char *p = avctx->extradata;

Modified: trunk/libavcodec/h264.h
==============================================================================
--- trunk/libavcodec/h264.h	Fri Feb 26 03:54:03 2010	(r22070)
+++ trunk/libavcodec/h264.h	Fri Feb 26 04:27:52 2010	(r22071)
@@ -1037,9 +1037,6 @@ static void fill_decode_caches(H264Conte
                 continue;
 
             if(!(mb_type&(MB_TYPE_SKIP|MB_TYPE_DIRECT2))) {
-            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)
             h->ref_cache[list][scan8[4 ]] =
             h->ref_cache[list][scan8[12]] = PART_NOT_AVAILABLE;
             AV_ZERO32(h->mv_cache [list][scan8[4 ]]);