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/svq3.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/svq3.c')
| -rw-r--r-- | libavcodec/svq3.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/svq3.c b/libavcodec/svq3.c index 5a5cf26a33..992c100051 100644 --- a/libavcodec/svq3.c +++ b/libavcodec/svq3.c @@ -768,7 +768,7 @@ static int svq3_decode_mb(SVQ3Context *s, unsigned int mb_type) } } - h->cbp = cbp; + sl->cbp = cbp; h->cur_pic.mb_type[mb_xy] = mb_type; if (IS_INTRA(mb_type)) @@ -1306,7 +1306,7 @@ static int svq3_decode_frame(AVCodecContext *avctx, void *data, return -1; } - if (mb_type != 0 || h->cbp) + if (mb_type != 0 || sl->cbp) ff_h264_hl_decode_mb(h, &h->slice_ctx[0]); if (h->pict_type != AV_PICTURE_TYPE_B && !h->low_delay) |