diff options
| author | Anton Khirnov <anton@khirnov.net> | 2015-01-27 14:21:09 +0100 |
|---|---|---|
| committer | Anton Khirnov <anton@khirnov.net> | 2015-03-21 11:27:14 +0100 |
| commit | 404a416d4b1fcbf9db5569481d8181f296c01ea9 (patch) | |
| tree | 8cf1be8bf8b3aa19b5937d7bf732982b4672365f /libavcodec/h264_cavlc.c | |
| parent | 7bbc254d646ed9cf6deffc3fda75ae6729f95979 (diff) | |
h264: remove some remnants of data partitioning
Diffstat (limited to 'libavcodec/h264_cavlc.c')
| -rw-r--r-- | libavcodec/h264_cavlc.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libavcodec/h264_cavlc.c b/libavcodec/h264_cavlc.c index 95b09a9fa4..6b0c7b70d4 100644 --- a/libavcodec/h264_cavlc.c +++ b/libavcodec/h264_cavlc.c @@ -636,7 +636,7 @@ static av_always_inline int decode_luma_residual(H264Context *h, H264SliceContex AV_ZERO128(sl->mb_luma_dc[p]+8); AV_ZERO128(sl->mb_luma_dc[p]+16); AV_ZERO128(sl->mb_luma_dc[p]+24); - if( decode_residual(h, sl, h->intra_gb_ptr, sl->mb_luma_dc[p], LUMA_DC_BLOCK_INDEX+p, scan, NULL, 16) < 0){ + if (decode_residual(h, sl, gb, sl->mb_luma_dc[p], LUMA_DC_BLOCK_INDEX + p, scan, NULL, 16) < 0) { return -1; //FIXME continue if partitioned and other return -1 too } @@ -646,7 +646,7 @@ static av_always_inline int decode_luma_residual(H264Context *h, H264SliceContex for(i8x8=0; i8x8<4; i8x8++){ for(i4x4=0; i4x4<4; i4x4++){ const int index= i4x4 + 4*i8x8 + p*16; - if( decode_residual(h, sl, h->intra_gb_ptr, sl->mb + (16*index << pixel_shift), + if( decode_residual(h, sl, gb, sl->mb + (16*index << pixel_shift), index, scan + 1, h->dequant4_coeff[p][qscale], 15) < 0 ){ return -1; } @@ -1083,7 +1083,7 @@ decode_intra_mb: int i4x4, i8x8, chroma_idx; int dquant; int ret; - GetBitContext *gb= IS_INTRA(mb_type) ? h->intra_gb_ptr : h->inter_gb_ptr; + GetBitContext *gb = &h->gb; const uint8_t *scan, *scan8x8; const int max_qp = 51 + 6*(h->sps.bit_depth_luma-8); |