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_cabac.c | |
| parent | e6c90ce94f1b07f50cea2babf7471af455cca0ff (diff) | |
| download | ffmpeg-a9b201cacf85d710b102010cb4baef97f00ea39b.tar.gz | |
h264: move cabac_init_idc into the per-slice context
Diffstat (limited to 'libavcodec/h264_cabac.c')
| -rw-r--r-- | libavcodec/h264_cabac.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/h264_cabac.c b/libavcodec/h264_cabac.c index 2dbd7ced80..c029fd5df8 100644 --- a/libavcodec/h264_cabac.c +++ b/libavcodec/h264_cabac.c @@ -1268,7 +1268,7 @@ void ff_h264_init_cabac_states(H264Context *h, H264SliceContext *sl) const int slice_qp = av_clip(sl->qscale - 6*(h->sps.bit_depth_luma-8), 0, 51); if (sl->slice_type_nos == AV_PICTURE_TYPE_I) tab = cabac_context_init_I; - else tab = cabac_context_init_PB[h->cabac_init_idc]; + else tab = cabac_context_init_PB[sl->cabac_init_idc]; /* calculate pre-state */ for( i= 0; i < 1024; i++ ) { |