aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec/dxva2_h264.c
diff options
context:
space:
mode:
authorAnton Khirnov <anton@khirnov.net>2015-01-17 22:28:46 +0100
committerAnton Khirnov <anton@khirnov.net>2015-03-21 11:27:13 +0100
commit066aafced4dc6c7c9e7b37082635472249f1e93e (patch)
tree86888b90a0078a5fa65a3af3e7ddd07869c7cfc0 /libavcodec/dxva2_h264.c
parented451a08a46b2b07fd2dba3e55ffddd18ae6e3d6 (diff)
downloadffmpeg-066aafced4dc6c7c9e7b37082635472249f1e93e.tar.gz
h264: move direct_spatial_mv_pred into the per-slice context
Diffstat (limited to 'libavcodec/dxva2_h264.c')
-rw-r--r--libavcodec/dxva2_h264.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/dxva2_h264.c b/libavcodec/dxva2_h264.c
index 9218316df9..ef2fc3d898 100644
--- a/libavcodec/dxva2_h264.c
+++ b/libavcodec/dxva2_h264.c
@@ -279,7 +279,7 @@ static void fill_slice_long(AVCodecContext *avctx, DXVA_Slice_H264_Long *slice,
slice->slice_qp_delta = sl->qscale - h->pps.init_qp;
slice->redundant_pic_cnt = h->redundant_pic_count;
if (sl->slice_type == AV_PICTURE_TYPE_B)
- slice->direct_spatial_mv_pred_flag = h->direct_spatial_mv_pred;
+ slice->direct_spatial_mv_pred_flag = sl->direct_spatial_mv_pred;
slice->cabac_init_idc = h->pps.cabac ? h->cabac_init_idc : 0;
if (h->deblocking_filter < 2)
slice->disable_deblocking_filter_idc = 1 - h->deblocking_filter;