summaryrefslogtreecommitdiffstats
path: root/video
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2013-07-18 13:46:05 +0200
committerwm4 <wm4@nowhere>2013-07-18 13:46:05 +0200
commit7f88e36911fc1ad8a59c7335a0d33119519742fc (patch)
tree9df27e19544ea58d28dcf6e1b4bf0b00e7775fea /video
parent4fd06a78aecf6b52ae28170cfa05ba0d36e75265 (diff)
downloadmpv-7f88e36911fc1ad8a59c7335a0d33119519742fc.tar.bz2
mpv-7f88e36911fc1ad8a59c7335a0d33119519742fc.tar.xz
sws_utils: don't recursively include libswscale header
Add libswscale includes where they are actually needed instead.
Diffstat (limited to 'video')
-rw-r--r--video/filter/vf_scale.c2
-rw-r--r--video/out/vo_x11.c1
-rw-r--r--video/sws_utils.c1
-rw-r--r--video/sws_utils.h1
4 files changed, 4 insertions, 1 deletions
diff --git a/video/filter/vf_scale.c b/video/filter/vf_scale.c
index c79c55c6e1..4653b3bcbe 100644
--- a/video/filter/vf_scale.c
+++ b/video/filter/vf_scale.c
@@ -22,6 +22,8 @@
#include <inttypes.h>
#include <sys/types.h>
+#include <libswscale/swscale.h>
+
#include "config.h"
#include "core/mp_msg.h"
#include "core/options.h"
diff --git a/video/out/vo_x11.c b/video/out/vo_x11.c
index 6bf78d60f1..0762d55400 100644
--- a/video/out/vo_x11.c
+++ b/video/out/vo_x11.c
@@ -21,6 +21,7 @@
#include <string.h>
#include <sys/types.h>
+#include <libswscale/swscale.h>
#include <libavutil/common.h>
#include "config.h"
diff --git a/video/sws_utils.c b/video/sws_utils.c
index 6d88a537e4..652887d232 100644
--- a/video/sws_utils.c
+++ b/video/sws_utils.c
@@ -18,6 +18,7 @@
#include <assert.h>
+#include <libswscale/swscale.h>
#include <libavutil/opt.h>
#include "sws_utils.h"
diff --git a/video/sws_utils.h b/video/sws_utils.h
index aa6828a35e..f35cd626d1 100644
--- a/video/sws_utils.h
+++ b/video/sws_utils.h
@@ -2,7 +2,6 @@
#define MPLAYER_SWS_UTILS_H
#include <stdbool.h>
-#include <libswscale/swscale.h>
#include "mp_image.h"