diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-03-21 17:46:28 +0300 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-03-21 17:48:13 +0300 |
| commit | 4c5c913dd8d946022ba160ec480694222aab061d (patch) | |
| tree | 9a334723d85f05425e9d43bad3f18d1435d96f36 /libavcodec/h264_mb_template.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_template.c')
| -rw-r--r-- | libavcodec/h264_mb_template.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/h264_mb_template.c b/libavcodec/h264_mb_template.c index b4ef404649..b7f4a059b2 100644 --- a/libavcodec/h264_mb_template.c +++ b/libavcodec/h264_mb_template.c @@ -191,7 +191,7 @@ static av_noinline void FUNC(hl_decode_mb)(H264Context *h, H264SliceContext *sl) PIXEL_SHIFT, block_offset, linesize, dest_y, 0); if ((SIMPLE || !CONFIG_GRAY || !(h->flags & CODEC_FLAG_GRAY)) && - (h->cbp & 0x30)) { + (sl->cbp & 0x30)) { uint8_t *dest[2] = { dest_cb, dest_cr }; if (transform_bypass) { if (IS_INTRA(mb_type) && h->sps.profile_idc == 244 && |