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:14 +0100 |
| commit | a9b201cacf85d710b102010cb4baef97f00ea39b (patch) | |
| tree | 9a02274cb412bc791360fc4fece8585593604212 /libavcodec/h264_slice.c | |
| parent | e6c90ce94f1b07f50cea2babf7471af455cca0ff (diff) | |
| download | ffmpeg-a9b201cacf85d710b102010cb4baef97f00ea39b.tar.gz | |
h264: move cabac_init_idc into the per-slice context
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 a45bf9fffd..59016c147b 100644 --- a/libavcodec/h264_slice.c +++ b/libavcodec/h264_slice.c @@ -608,7 +608,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); @@ -1657,7 +1657,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; |