Browse Source

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

Originally committed as revision 22071 to svn://svn.ffmpeg.org/ffmpeg/trunk
tags/v0.6
Michael Niedermayer 16 years ago
parent
commit
747db4e31a
2 changed files with 4 additions and 3 deletions
  1. +4
    -0
      libavcodec/h264.c
  2. +0
    -3
      libavcodec/h264.h

+ 4
- 0
libavcodec/h264.c View File

@@ -872,6 +872,10 @@ av_cold int ff_h264_decode_init(AVCodecContext *avctx){
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;


+ 0
- 3
libavcodec/h264.h View File

@@ -1037,9 +1037,6 @@ static void fill_decode_caches(H264Context *h, int mb_type){
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 ]]);


Loading…
Cancel
Save