diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-03-21 12:58:00 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-03-21 12:58:00 +0100 |
| commit | 92656787cfeaf28af368bd4c20ffbaedc8ad3ca9 (patch) | |
| tree | e02cc36e4c072e410ff7252b5599f56f186623ed /libavcodec/h264_mvpred.h | |
| parent | bf4d0f8328c8f64611ca44a6ffdc30ca4f028249 (diff) | |
| parent | 6d2b6f21eb45ffbda1103c772060303648714832 (diff) | |
| download | ffmpeg-92656787cfeaf28af368bd4c20ffbaedc8ad3ca9.tar.gz | |
Merge commit '6d2b6f21eb45ffbda1103c772060303648714832'
* commit '6d2b6f21eb45ffbda1103c772060303648714832':
h264: add a parameter to the CABAC macro.
h264: add a parameter to the FIELD_OR_MBAFF_PICTURE macro.
Conflicts:
libavcodec/h264.c
libavcodec/h264_cabac.c
libavcodec/h264_cavlc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/h264_mvpred.h')
| -rw-r--r-- | libavcodec/h264_mvpred.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libavcodec/h264_mvpred.h b/libavcodec/h264_mvpred.h index 0a184b984c..361c1d7793 100644 --- a/libavcodec/h264_mvpred.h +++ b/libavcodec/h264_mvpred.h @@ -544,7 +544,7 @@ static void fill_decode_caches(H264Context *h, int mb_type) AV_COPY32(&nnz_cache[4 + 8 * 10], &nnz[4 * 9]); } } else { - uint32_t top_empty = CABAC && !IS_INTRA(mb_type) ? 0 : 0x40404040; + uint32_t top_empty = CABAC(h) && !IS_INTRA(mb_type) ? 0 : 0x40404040; AV_WN32A(&nnz_cache[4 + 8 * 0], top_empty); AV_WN32A(&nnz_cache[4 + 8 * 5], top_empty); AV_WN32A(&nnz_cache[4 + 8 * 10], top_empty); @@ -575,11 +575,11 @@ static void fill_decode_caches(H264Context *h, int mb_type) nnz_cache[3 + 8 * 6 + 2 * 8 * i] = nnz_cache[3 + 8 * 7 + 2 * 8 * i] = nnz_cache[3 + 8 * 11 + 2 * 8 * i] = - nnz_cache[3 + 8 * 12 + 2 * 8 * i] = CABAC && !IS_INTRA(mb_type) ? 0 : 64; + nnz_cache[3 + 8 * 12 + 2 * 8 * i] = CABAC(h) && !IS_INTRA(mb_type) ? 0 : 64; } } - if (CABAC) { + if (CABAC(h)) { // top_cbp if (top_type) h->top_cbp = h->cbp_table[top_xy]; @@ -688,7 +688,7 @@ static void fill_decode_caches(H264Context *h, int mb_type) AV_ZERO32(mv_cache[2 + 8 * 0]); AV_ZERO32(mv_cache[2 + 8 * 2]); - if (CABAC) { + if (CABAC(h)) { if (USES_LIST(top_type, list)) { const int b_xy = h->mb2br_xy[top_xy]; AV_COPY64(mvd_cache[0 - 1 * 8], mvd[b_xy + 0]); |