diff options
| author | Anton Khirnov <anton@khirnov.net> | 2015-01-17 22:28:46 +0100 |
|---|---|---|
| committer | Anton Khirnov <anton@khirnov.net> | 2015-03-21 11:27:13 +0100 |
| commit | e7226984ac13aacb84eae77a372df8ff7685848f (patch) | |
| tree | 57ef86e9247fbf9abc8ffea1c830f75df509014b /libavcodec/h264_mb.c | |
| parent | 30da98adbda6de1f55188f9058a3a5c715049633 (diff) | |
| download | ffmpeg-e7226984ac13aacb84eae77a372df8ff7685848f.tar.gz | |
h264: move [{top,left}_]cbp into the per-slice context
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 0bc43dbd81..5176e54e33 100644 --- a/libavcodec/h264_mb.c +++ b/libavcodec/h264_mb.c @@ -763,7 +763,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 |