diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-03-21 16:06:53 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-03-21 16:06:57 +0100 |
| commit | 04d23cf1c5f678f5fe0fe0eb5fd92a59c70e8c42 (patch) | |
| tree | da717a856506847fcad679c9487714044be1275e /libavcodec/h264_slice.c | |
| parent | 7d23931632ea3af55ec4ddb1e572ff31aa2c1e9a (diff) | |
| parent | a9b201cacf85d710b102010cb4baef97f00ea39b (diff) | |
| download | ffmpeg-04d23cf1c5f678f5fe0fe0eb5fd92a59c70e8c42.tar.gz | |
Merge commit 'a9b201cacf85d710b102010cb4baef97f00ea39b'
* commit 'a9b201cacf85d710b102010cb4baef97f00ea39b':
h264: move cabac_init_idc into the per-slice context
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/h264_slice.c')
| -rw-r--r-- | libavcodec/h264_slice.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/h264_slice.c b/libavcodec/h264_slice.c index 1fbff66748..88e702f6ef 100644 --- a/libavcodec/h264_slice.c +++ b/libavcodec/h264_slice.c @@ -659,7 +659,7 @@ int ff_h264_update_thread_context(AVCodecContext *dst, copy_fields(h, h1, poc_lsb, redundant_pic_count); // reference lists - copy_fields(h, h1, short_ref, cabac_init_idc); + copy_fields(h, h1, short_ref, thread_context); copy_picture_range(h->short_ref, h1->short_ref, 32, h, h1); copy_picture_range(h->long_ref, h1->long_ref, 32, h, h1); @@ -1859,7 +1859,7 @@ int ff_h264_decode_slice_header(H264Context *h, H264SliceContext *sl, H264Contex av_log(h->avctx, AV_LOG_ERROR, "cabac_init_idc %u overflow\n", tmp); return AVERROR_INVALIDDATA; } - h->cabac_init_idc = tmp; + sl->cabac_init_idc = tmp; } sl->last_qscale_diff = 0; |