# HG changeset patch # User michael # Date 1267154872 0 # Node ID b79f22337b6f3f07d3f5ff7f32d319dbd8357989 # Parent b5836ef8e74e6610abad7e022cf6008629b9a579 Move init of right side of ref_cache from fill_caches() to init_the_darn_decoder(). diff -r b5836ef8e74e -r b79f22337b6f h264.c --- a/h264.c Fri Feb 26 02:54:03 2010 +0000 +++ b/h264.c Fri Feb 26 03:27:52 2010 +0000 @@ -872,6 +872,10 @@ 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; diff -r b5836ef8e74e -r b79f22337b6f h264.h --- a/h264.h Fri Feb 26 02:54:03 2010 +0000 +++ b/h264.h Fri Feb 26 03:27:52 2010 +0000 @@ -1037,9 +1037,6 @@ 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 ]]);