From 7f88e36911fc1ad8a59c7335a0d33119519742fc Mon Sep 17 00:00:00 2001
From: wm4 <wm4@nowhere>
Date: Thu, 18 Jul 2013 13:46:05 +0200
Subject: sws_utils: don't recursively include libswscale header

Add libswscale includes where they are actually needed instead.
---
 sub/draw_bmp.c          | 1 +
 video/filter/vf_scale.c | 2 ++
 video/out/vo_x11.c      | 1 +
 video/sws_utils.c       | 1 +
 video/sws_utils.h       | 1 -
 5 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/sub/draw_bmp.c b/sub/draw_bmp.c
index 4057500f01..4615458f15 100644
--- a/sub/draw_bmp.c
+++ b/sub/draw_bmp.c
@@ -22,6 +22,7 @@
 #include <math.h>
 #include <inttypes.h>
 
+#include <libswscale/swscale.h>
 #include <libavutil/common.h>
 
 #include "core/mp_common.h"
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"
 
-- 
cgit v1.2.3