Mercurial > libavcodec.hg
comparison mpegvideo.c @ 11531:31033caa5344 libavcodec
Change ref_index structure so it matches how its organized in h264.
Also revert the related error concealment hotfix.
| author | michael |
|---|---|
| date | Tue, 23 Mar 2010 02:17:04 +0000 |
| parents | 2029a714b794 |
| children | 7dd2a45249a9 |
comparison
equal
deleted
inserted
replaced
| 11530:86e4be64519e | 11531:31033caa5344 |
|---|---|
| 294 pic->motion_subsample_log2= 2; | 294 pic->motion_subsample_log2= 2; |
| 295 }else if(s->out_format == FMT_H263 || s->encoding || (s->avctx->debug&FF_DEBUG_MV) || (s->avctx->debug_mv)){ | 295 }else if(s->out_format == FMT_H263 || s->encoding || (s->avctx->debug&FF_DEBUG_MV) || (s->avctx->debug_mv)){ |
| 296 for(i=0; i<2; i++){ | 296 for(i=0; i<2; i++){ |
| 297 FF_ALLOCZ_OR_GOTO(s->avctx, pic->motion_val_base[i], 2 * (b8_array_size+4) * sizeof(int16_t), fail) | 297 FF_ALLOCZ_OR_GOTO(s->avctx, pic->motion_val_base[i], 2 * (b8_array_size+4) * sizeof(int16_t), fail) |
| 298 pic->motion_val[i]= pic->motion_val_base[i]+4; | 298 pic->motion_val[i]= pic->motion_val_base[i]+4; |
| 299 FF_ALLOCZ_OR_GOTO(s->avctx, pic->ref_index[i], b8_array_size * sizeof(uint8_t), fail) | 299 FF_ALLOCZ_OR_GOTO(s->avctx, pic->ref_index[i], 4*mb_array_size * sizeof(uint8_t), fail) |
| 300 } | 300 } |
| 301 pic->motion_subsample_log2= 3; | 301 pic->motion_subsample_log2= 3; |
| 302 } | 302 } |
| 303 if(s->avctx->debug&FF_DEBUG_DCT_COEFF) { | 303 if(s->avctx->debug&FF_DEBUG_DCT_COEFF) { |
| 304 FF_ALLOCZ_OR_GOTO(s->avctx, pic->dct_coeff, 64 * mb_array_size * sizeof(DCTELEM)*6, fail) | 304 FF_ALLOCZ_OR_GOTO(s->avctx, pic->dct_coeff, 64 * mb_array_size * sizeof(DCTELEM)*6, fail) |