10 files changed, 15 insertions, 16 deletions
diff --git a/Gui/wm/ws.c b/Gui/wm/ws.c
index 99535ef88d..350b35fcbd 100644
--- a/Gui/wm/ws.c
+++ b/Gui/wm/ws.c
@@ -25,6 +25,7 @@
 #include "../../cpudetect.h"
 #include "../../postproc/swscale.h"
 #include "../../postproc/rgb2rgb.h"
+#include "../../libmpcodecs/vf_scale.h"
 #include "../../mp_msg.h"
 #include "../../mplayer.h"
 
@@ -93,13 +94,6 @@ inline int wsSearch( Window win );
 
 // ---
 
-static int get_sws_cpuflags()
-{
-    return (gCpuCaps.hasMMX ? SWS_CPU_CAPS_MMX : 0) |
-	(gCpuCaps.hasMMX2 ? SWS_CPU_CAPS_MMX2 : 0) |
-	(gCpuCaps.has3DNow ? SWS_CPU_CAPS_3DNOW : 0);
-}
-
 #define PACK_RGB16(r,g,b,pixel) pixel=(b>>3);\
                                 pixel<<=6;\
                                 pixel|=(g>>2);\
diff --git a/libmpcodecs/vf_sab.c b/libmpcodecs/vf_sab.c
index 6750fe6fce..58729b1957 100644
--- a/libmpcodecs/vf_sab.c
+++ b/libmpcodecs/vf_sab.c
@@ -34,6 +34,7 @@
 #include "vf.h"
 #include "../libvo/fastmemcpy.h"
 #include "../postproc/swscale.h"
+#include "vf_scale.h"
 
 
 //===========================================================================//
diff --git a/libmpcodecs/vf_scale.c b/libmpcodecs/vf_scale.c
index 92a8ab9c25..7da8a97ae3 100644
--- a/libmpcodecs/vf_scale.c
+++ b/libmpcodecs/vf_scale.c
@@ -13,6 +13,7 @@
 
 #include "../libvo/fastmemcpy.h"
 #include "../postproc/swscale.h"
+#include "vf_scale.h"
 
 #include "m_option.h"
 #include "m_struct.h"
@@ -30,7 +31,6 @@ static struct vf_priv_s {
   0,
   0,
   NULL,
-  NULL,
   NULL
 };
 
@@ -40,7 +40,6 @@ extern int opt_screen_size_y;
 //===========================================================================//
 
 void sws_getFlagsAndFilterFromCmdLine(int *flags, SwsFilter **srcFilterParam, SwsFilter **dstFilterParam);
-struct SwsContext *sws_getContextFromCmdLine(int srcW, int srcH, int srcFormat, int dstW, int dstH, int dstFormat);
 
 static unsigned int outfmt_list[]={
 // RGB:
@@ -319,6 +318,7 @@ static int control(struct vf_instance_s* vf, int request, void* data){
 
 	return CONTROL_TRUE;
     default:
+	break;
     }
     
     return vf_next_control(vf,request,data);
diff --git a/libmpcodecs/vf_scale.h b/libmpcodecs/vf_scale.h
new file mode 100644
index 0000000000..8e863af8bc
--- /dev/null
+++ b/libmpcodecs/vf_scale.h
@@ -0,0 +1,4 @@
+//GPL
+
+int get_sws_cpuflags();
+struct SwsContext *sws_getContextFromCmdLine(int srcW, int srcH, int srcFormat, int dstW, int dstH, int dstFormat);
diff --git a/libmpcodecs/vf_smartblur.c b/libmpcodecs/vf_smartblur.c
index 6841347b94..cd817de5d1 100644
--- a/libmpcodecs/vf_smartblur.c
+++ b/libmpcodecs/vf_smartblur.c
@@ -38,6 +38,7 @@
 #include "vf.h"
 #include "../libvo/fastmemcpy.h"
 #include "../postproc/swscale.h"
+#include "vf_scale.h"
 
 //===========================================================================//
 
diff --git a/libvo/mga_common.c b/libvo/mga_common.c
index 072a1d7067..e5ef50042d 100644
--- a/libvo/mga_common.c
+++ b/libvo/mga_common.c
@@ -4,6 +4,7 @@
 #include "../cpudetect.h"
 #include "../postproc/swscale.h"
 #include "../postproc/rgb2rgb.h"
+#include "../libmpcodecs/vf_scale.h"
 #include "mp_msg.h"
 
 // mga_vid drawing functions
@@ -415,13 +416,6 @@ static int mga_uninit(){
   return 0;
 }
 
-static int get_sws_cpuflags(){
-    return 
-          (gCpuCaps.hasMMX   ? SWS_CPU_CAPS_MMX   : 0)
-	| (gCpuCaps.hasMMX2  ? SWS_CPU_CAPS_MMX2  : 0)
-	| (gCpuCaps.has3DNow ? SWS_CPU_CAPS_3DNOW : 0);
-}
-
 static uint32_t preinit(const char *vo_subdevice)
 {
   const char *devname=vo_subdevice?vo_subdevice:"/dev/mga_vid";
diff --git a/libvo/vo_aa.c b/libvo/vo_aa.c
index f01c2e63f6..f9c700a058 100644
--- a/libvo/vo_aa.c
+++ b/libvo/vo_aa.c
@@ -28,6 +28,7 @@
 #include "video_out_internal.h"
 #include "aspect.h"
 #include "../postproc/swscale.h"
+#include "../libmpcodecs/vf_scale.h"
 #include "font_load.h"
 #include "sub.h"
 
diff --git a/libvo/vo_vesa.c b/libvo/vo_vesa.c
index d046e309e2..ba911521ec 100644
--- a/libvo/vo_vesa.c
+++ b/libvo/vo_vesa.c
@@ -45,6 +45,7 @@
 #endif
 
 #include "../postproc/swscale.h"
+#include "../libmpcodecs/vf_scale.h"
 
 
 #ifdef HAVE_PNG
diff --git a/libvo/vo_x11.c b/libvo/vo_x11.c
index 6b6ea84251..079662bafd 100644
--- a/libvo/vo_x11.c
+++ b/libvo/vo_x11.c
@@ -25,6 +25,7 @@
 #include "../postproc/swscale.h"
 #include "../postproc/swscale_internal.h" //FIXME
 #include "../postproc/rgb2rgb.h"
+#include "../libmpcodecs/vf_scale.h"
 
 #include "../mp_msg.h"
 
diff --git a/postproc/rgb2rgb.h b/postproc/rgb2rgb.h
index fe7d98a1cd..f5cb903026 100644
--- a/postproc/rgb2rgb.h
+++ b/postproc/rgb2rgb.h
@@ -127,4 +127,6 @@ static void yuv2rgb_init (unsigned bpp, int mode){
 printf("broken, this should use the swscaler\n");
 }
 
+void sws_rgb2rgb_init(int flags);
+
 #endif