[Mplayer-cvslog] CVS: main/libvo vo_x11.c,1.131,1.132 vo_aa.c,1.41,1.42 vo_vesa.c,1.92,1.93 mga_common.c,1.56,1.57

[Michael Niedermayer CVS]

Update of /cvsroot/mplayer/main/libvo
In directory mail:/var/tmp.root/cvs-serv29757/libvo

Modified Files:
	vo_x11.c vo_aa.c vo_vesa.c mga_common.c 
Log Message:
vf_scale.h & related cleanup & some small warning fix by dominik


Index: vo_x11.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/vo_x11.c,v
retrieving revision 1.131
retrieving revision 1.132
diff -u -r1.131 -r1.132
--- vo_x11.c	30 May 2003 18:05:49 -0000	1.131
+++ vo_x11.c	1 Jun 2003 21:59:28 -0000	1.132
@@ -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"
 

Index: vo_aa.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/vo_aa.c,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- vo_aa.c	30 Mar 2003 17:23:13 -0000	1.41
+++ vo_aa.c	1 Jun 2003 21:59:28 -0000	1.42
@@ -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"
 

Index: vo_vesa.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/vo_vesa.c,v
retrieving revision 1.92
retrieving revision 1.93
diff -u -r1.92 -r1.93
--- vo_vesa.c	21 Apr 2003 16:59:10 -0000	1.92
+++ vo_vesa.c	1 Jun 2003 21:59:28 -0000	1.93
@@ -45,6 +45,7 @@
 #endif
 
 #include "../postproc/swscale.h"
+#include "../libmpcodecs/vf_scale.h"
 
 
 #ifdef HAVE_PNG

Index: mga_common.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/mga_common.c,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -r1.56 -r1.57
--- mga_common.c	27 Apr 2003 18:44:23 -0000	1.56
+++ mga_common.c	1 Jun 2003 21:59:28 -0000	1.57
@@ -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
@@ -413,13 +414,6 @@
 	f = -1;
   }
   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)