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_cabac.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_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 c84bd1d507..74c4b8d0aa 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++ ) { |