Commit 37d3e429 authored by michael's avatar michael

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


git-svn-id: file:///var/local/repositories/ffmpeg/trunk@22071 9553f0bf-9b14-0410-a0b8-cfaf0461ba5b
parent 4554b94a
...@@ -872,6 +872,10 @@ av_cold int ff_h264_decode_init(AVCodecContext *avctx){ ...@@ -872,6 +872,10 @@ av_cold int ff_h264_decode_init(AVCodecContext *avctx){
avctx->ticks_per_frame = 2; 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){ if(avctx->extradata_size > 0 && avctx->extradata && *(char *)avctx->extradata == 1){
int i, cnt, nalsize; int i, cnt, nalsize;
unsigned char *p = avctx->extradata; unsigned char *p = avctx->extradata;
......
...@@ -1037,9 +1037,6 @@ static void fill_decode_caches(H264Context *h, int mb_type){ ...@@ -1037,9 +1037,6 @@ static void fill_decode_caches(H264Context *h, int mb_type){
continue; continue;
if(!(mb_type&(MB_TYPE_SKIP|MB_TYPE_DIRECT2))) { 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[4 ]] =
h->ref_cache[list][scan8[12]] = PART_NOT_AVAILABLE; h->ref_cache[list][scan8[12]] = PART_NOT_AVAILABLE;
AV_ZERO32(h->mv_cache [list][scan8[4 ]]); AV_ZERO32(h->mv_cache [list][scan8[4 ]]);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment