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_cavlc.c | |
| parent | f5d4d618242f412626f65e5f9b5a069448bf219b (diff) | |
| parent | e7226984ac13aacb84eae77a372df8ff7685848f (diff) | |
| download | ffmpeg-4c5c913dd8d946022ba160ec480694222aab061d.tar.gz | |
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_cavlc.c')
| -rw-r--r-- | libavcodec/h264_cavlc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/h264_cavlc.c b/libavcodec/h264_cavlc.c index af8a8b637c..ab60f83baa 100644 --- a/libavcodec/h264_cavlc.c +++ b/libavcodec/h264_cavlc.c @@ -1088,7 +1088,7 @@ decode_intra_mb: if(dct8x8_allowed && (cbp&15) && !IS_INTRA(mb_type)){ mb_type |= MB_TYPE_8x8DCT*get_bits1(&h->gb); } - h->cbp= + sl->cbp= h->cbp_table[mb_xy]= cbp; h->cur_pic.mb_type[mb_xy] = mb_type; |