From eacd97d536fc056eecb159949384841067c90594 Mon Sep 17 00:00:00 2001 From: James Ross-Gowan Date: Sat, 26 Aug 2017 00:28:58 +1000 Subject: mp_image: include config.h directly This is needed for HAVE_SSE4_INTRINSICS. config.h used to be included as a transitive dependency of vf.h, but the include statement was removed from vf.h in 8f2ccba71bb4. Also silence an unused variable warning that was introduced in the same commit. --- video/filter/vf_d3d11vpp.c | 1 - video/mp_image.c | 1 + 2 files changed, 1 insertion(+), 1 deletion(-) (limited to 'video') diff --git a/video/filter/vf_d3d11vpp.c b/video/filter/vf_d3d11vpp.c index cbd59fef93..44178a8622 100644 --- a/video/filter/vf_d3d11vpp.c +++ b/video/filter/vf_d3d11vpp.c @@ -463,7 +463,6 @@ static bool test_conversion(int in, int out) static int control(struct vf_instance *vf, int request, void* data) { - struct vf_priv_s *p = vf->priv; switch (request){ case VFCTRL_SEEK_RESET: flush_frames(vf); diff --git a/video/mp_image.c b/video/mp_image.c index 45e5330947..7180e2be50 100644 --- a/video/mp_image.c +++ b/video/mp_image.c @@ -30,6 +30,7 @@ #include "mpv_talloc.h" +#include "config.h" #include "common/common.h" #include "mp_image.h" #include "sws_utils.h" -- cgit v1.2.3