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/dxva2_h264.c | |
| parent | e6c90ce94f1b07f50cea2babf7471af455cca0ff (diff) | |
| download | ffmpeg-streaming-a9b201cacf85d710b102010cb4baef97f00ea39b.zip ffmpeg-streaming-a9b201cacf85d710b102010cb4baef97f00ea39b.tar.gz | |
h264: move cabac_init_idc into the per-slice context
Diffstat (limited to 'libavcodec/dxva2_h264.c')
| -rw-r--r-- | libavcodec/dxva2_h264.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/dxva2_h264.c b/libavcodec/dxva2_h264.c index 5e84275..f7b1671 100644 --- a/libavcodec/dxva2_h264.c +++ b/libavcodec/dxva2_h264.c @@ -280,7 +280,7 @@ static void fill_slice_long(AVCodecContext *avctx, DXVA_Slice_H264_Long *slice, slice->redundant_pic_cnt = h->redundant_pic_count; if (sl->slice_type == AV_PICTURE_TYPE_B) slice->direct_spatial_mv_pred_flag = sl->direct_spatial_mv_pred; - slice->cabac_init_idc = h->pps.cabac ? h->cabac_init_idc : 0; + slice->cabac_init_idc = h->pps.cabac ? sl->cabac_init_idc : 0; if (sl->deblocking_filter < 2) slice->disable_deblocking_filter_idc = 1 - sl->deblocking_filter; else |
