diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-03-21 15:46:28 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-03-21 15:48:13 +0100 |
| commit | 4c5c913dd8d946022ba160ec480694222aab061d (patch) | |
| tree | 9a334723d85f05425e9d43bad3f18d1435d96f36 /libavcodec/h264_mb.c | |
| parent | f5d4d618242f412626f65e5f9b5a069448bf219b (diff) | |
| parent | e7226984ac13aacb84eae77a372df8ff7685848f (diff) | |
Merge commit 'e7226984ac13aacb84eae77a372df8ff7685848f'
* commit 'e7226984ac13aacb84eae77a372df8ff7685848f':
h264: move [{top,left}_]cbp into the per-slice context
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/h264_mb.c')
| -rw-r--r-- | libavcodec/h264_mb.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/h264_mb.c b/libavcodec/h264_mb.c index 57d5b308b0..3e5afe76d0 100644 --- a/libavcodec/h264_mb.c +++ b/libavcodec/h264_mb.c @@ -768,7 +768,7 @@ static av_always_inline void hl_decode_mb_idct_luma(H264Context *h, H264SliceCon linesize, sl->non_zero_count_cache + p * 5 * 8); } - } else if (h->cbp & 15) { + } else if (sl->cbp & 15) { if (transform_bypass) { const int di = IS_8x8DCT(mb_type) ? 4 : 1; idct_add = IS_8x8DCT(mb_type) ? h->h264dsp.h264_add_pixels8_clear |