From 066aafced4dc6c7c9e7b37082635472249f1e93e Mon Sep 17 00:00:00 2001 From: Anton Khirnov Date: Sat, 17 Jan 2015 22:28:46 +0100 Subject: h264: move direct_spatial_mv_pred into the per-slice context --- libavcodec/h264_direct.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'libavcodec/h264_direct.c') diff --git a/libavcodec/h264_direct.c b/libavcodec/h264_direct.c index f94469522d..cd30dd33f2 100644 --- a/libavcodec/h264_direct.c +++ b/libavcodec/h264_direct.c @@ -140,7 +140,7 @@ void ff_h264_direct_ref_list_init(H264Context *const h, H264SliceContext *sl) h->col_fieldoff = 2 * h->ref_list[1][0].reference - 3; } - if (sl->slice_type_nos != AV_PICTURE_TYPE_B || h->direct_spatial_mv_pred) + if (sl->slice_type_nos != AV_PICTURE_TYPE_B || sl->direct_spatial_mv_pred) return; for (list = 0; list < 2; list++) { @@ -694,7 +694,7 @@ single_col: void ff_h264_pred_direct_motion(H264Context *const h, H264SliceContext *sl, int *mb_type) { - if (h->direct_spatial_mv_pred) + if (sl->direct_spatial_mv_pred) pred_spatial_direct_motion(h, sl, mb_type); else pred_temp_direct_motion(h, sl, mb_type); -- cgit v1.2.3