[MPlayer-cvslog] r18866 - in trunk: Gui/wm/ws.c Makefile libmpcodecs/vf_halfpack.c libmpcodecs/vf_palette.c libmpcodecs/vf_rgb2bgr.c libmpcodecs/vf_sab.c libmpcodecs/vf_scale.c libmpcodecs/vf_screenshot.c libmpcodecs/vf_smartblur.c libmpcodecs/vf_yuy2.c libswscale libvo/mga_common.c libvo/vo_aa.c libvo/vo_vesa.c libvo/vo_x11.c libvo/vo_yuv4mpeg.c postproc spudec.c

[lucabe]

Author: lucabe
Date: Fri Jun 30 14:00:31 2006
New Revision: 18866

Added:
   trunk/libswscale/
      - copied from r18862, /trunk/postproc/
Removed:
   trunk/postproc/
Modified:
   trunk/Gui/wm/ws.c
   trunk/Makefile
   trunk/libmpcodecs/vf_halfpack.c
   trunk/libmpcodecs/vf_palette.c
   trunk/libmpcodecs/vf_rgb2bgr.c
   trunk/libmpcodecs/vf_sab.c
   trunk/libmpcodecs/vf_scale.c
   trunk/libmpcodecs/vf_screenshot.c
   trunk/libmpcodecs/vf_smartblur.c
   trunk/libmpcodecs/vf_yuy2.c
   trunk/libvo/mga_common.c
   trunk/libvo/vo_aa.c
   trunk/libvo/vo_vesa.c
   trunk/libvo/vo_x11.c
   trunk/libvo/vo_yuv4mpeg.c
   trunk/spudec.c

Log:
Move postproc ---> libswscale


Modified: trunk/Gui/wm/ws.c
==============================================================================
--- trunk/Gui/wm/ws.c	(original)
+++ trunk/Gui/wm/ws.c	Fri Jun 30 14:00:31 2006
@@ -24,7 +24,7 @@
 #include "ws.h"
 #include "wsxdnd.h"
 #include "../cpudetect.h"
-#include "../postproc/swscale.h"
+#include "../libswscale/swscale.h"
 #include "../postproc/rgb2rgb.h"
 #include "../libmpcodecs/vf_scale.h"
 #include "../mp_msg.h"

Modified: trunk/Makefile
==============================================================================
--- trunk/Makefile	(original)
+++ trunk/Makefile	Fri Jun 30 14:00:31 2006
@@ -110,7 +110,7 @@
               $(W32_LIB) \
               libaf/libaf.a \
               libmpdemux/libmpdemux.a \
-              postproc/libswscale.a \
+              libswscale/libswscale.a \
               osdep/libosdep.a \
               $(DVDREAD_LIB) \
               $(DVDNAV_LIB) \
@@ -163,9 +163,9 @@
         libavcodec \
         libpostproc \
         libavformat \
+        libswscale \
         libao2 \
         osdep \
-        postproc \
         input \
         libvo \
         libaf \
@@ -218,7 +218,7 @@
               libmpcodecs/libmpcodecs.a \
               libao2/libao2.a \
               osdep/libosdep.a \
-              postproc/libswscale.a \
+              libswscale/libswscale.a \
               input/libinput.a \
               libvo/libvo.a \
               libaf/libaf.a \
@@ -302,6 +302,9 @@
 libavformat/libavformat.a:
 	$(MAKE) -C libavformat LIBPREF=lib LIBSUF=.a
 
+libswscale/libswscale.a:
+	$(MAKE) -C libswscale
+
 libmpeg2/libmpeg2.a:
 	$(MAKE) -C libmpeg2
 
@@ -335,9 +338,6 @@
 osdep/libosdep.a:
 	$(MAKE) -C osdep
 
-postproc/libswscale.a:
-	$(MAKE) -C postproc
-
 input/libinput.a:
 	$(MAKE) -C input
 
@@ -583,7 +583,7 @@
 libavutil/libavutil.a: $(wildcard libavutil/*.[ch])
 libavcodec/libavcodec.a: $(wildcard libavcodec/*.[ch] libavcodec/*/*.[chS])
 libavformat/libavformat.a: $(wildcard libavformat/*.[ch])
-postproc/libswscale.a: $(wildcard postproc/*.[ch])
+libswscale/libswscale.a: $(wildcard libswscale/*.[ch])
 
 libmpeg2/libmpeg2.a: $(wildcard libmpeg2/*.[ch])
 liba52/liba52.a: $(wildcard liba52/*.[ch])

Modified: trunk/libmpcodecs/vf_halfpack.c
==============================================================================
--- trunk/libmpcodecs/vf_halfpack.c	(original)
+++ trunk/libmpcodecs/vf_halfpack.c	Fri Jun 30 14:00:31 2006
@@ -13,7 +13,7 @@
 #include "vf.h"
 
 #include "libvo/fastmemcpy.h"
-#include "postproc/rgb2rgb.h"
+#include "libswscale/rgb2rgb.h"
 
 struct vf_priv_s {
 	int field;

Modified: trunk/libmpcodecs/vf_palette.c
==============================================================================
--- trunk/libmpcodecs/vf_palette.c	(original)
+++ trunk/libmpcodecs/vf_palette.c	Fri Jun 30 14:00:31 2006
@@ -11,7 +11,7 @@
 #include "mp_image.h"
 #include "vf.h"
 
-#include "postproc/rgb2rgb.h"
+#include "libswscale/rgb2rgb.h"
 
 //===========================================================================//
 

Modified: trunk/libmpcodecs/vf_rgb2bgr.c
==============================================================================
--- trunk/libmpcodecs/vf_rgb2bgr.c	(original)
+++ trunk/libmpcodecs/vf_rgb2bgr.c	Fri Jun 30 14:00:31 2006
@@ -11,7 +11,7 @@
 #include "vf.h"
 
 #include "libvo/fastmemcpy.h"
-#include "postproc/rgb2rgb.h"
+#include "libswscale/rgb2rgb.h"
 
 //===========================================================================//
 

Modified: trunk/libmpcodecs/vf_sab.c
==============================================================================
--- trunk/libmpcodecs/vf_sab.c	(original)
+++ trunk/libmpcodecs/vf_sab.c	Fri Jun 30 14:00:31 2006
@@ -33,7 +33,7 @@
 #include "mp_image.h"
 #include "vf.h"
 #include "libvo/fastmemcpy.h"
-#include "postproc/swscale.h"
+#include "libswscale/swscale.h"
 #include "vf_scale.h"
 
 

Modified: trunk/libmpcodecs/vf_scale.c
==============================================================================
--- trunk/libmpcodecs/vf_scale.c	(original)
+++ trunk/libmpcodecs/vf_scale.c	Fri Jun 30 14:00:31 2006
@@ -12,7 +12,7 @@
 #include "vf.h"
 
 #include "libvo/fastmemcpy.h"
-#include "postproc/swscale.h"
+#include "libswscale/swscale.h"
 #include "vf_scale.h"
 
 #include "m_option.h"

Modified: trunk/libmpcodecs/vf_screenshot.c
==============================================================================
--- trunk/libmpcodecs/vf_screenshot.c	(original)
+++ trunk/libmpcodecs/vf_screenshot.c	Fri Jun 30 14:00:31 2006
@@ -22,7 +22,7 @@
 #include "vf_scale.h"
 
 #include "libvo/fastmemcpy.h"
-#include "postproc/swscale.h"
+#include "libswscale/swscale.h"
 
 struct vf_priv_s {
     int frameno;

Modified: trunk/libmpcodecs/vf_smartblur.c
==============================================================================
--- trunk/libmpcodecs/vf_smartblur.c	(original)
+++ trunk/libmpcodecs/vf_smartblur.c	Fri Jun 30 14:00:31 2006
@@ -33,7 +33,7 @@
 #include "mp_image.h"
 #include "vf.h"
 #include "libvo/fastmemcpy.h"
-#include "postproc/swscale.h"
+#include "libswscale/swscale.h"
 #include "vf_scale.h"
 
 //===========================================================================//

Modified: trunk/libmpcodecs/vf_yuy2.c
==============================================================================
--- trunk/libmpcodecs/vf_yuy2.c	(original)
+++ trunk/libmpcodecs/vf_yuy2.c	Fri Jun 30 14:00:31 2006
@@ -12,7 +12,7 @@
 #include "vf.h"
 
 #include "libvo/fastmemcpy.h"
-#include "postproc/rgb2rgb.h"
+#include "libswscale/rgb2rgb.h"
 #include "vf_scale.h"
 
 //===========================================================================//

Modified: trunk/libvo/mga_common.c
==============================================================================
--- trunk/libvo/mga_common.c	(original)
+++ trunk/libvo/mga_common.c	Fri Jun 30 14:00:31 2006
@@ -1,7 +1,7 @@
 
 #include "fastmemcpy.h"
 #include "cpudetect.h"
-#include "postproc/swscale.h"
+#include "libswscale/swscale.h"
 #include "libmpcodecs/vf_scale.h"
 #include "mp_msg.h"
 #include "help_mp.h"

Modified: trunk/libvo/vo_aa.c
==============================================================================
--- trunk/libvo/vo_aa.c	(original)
+++ trunk/libvo/vo_aa.c	Fri Jun 30 14:00:31 2006
@@ -27,7 +27,7 @@
 #include "video_out.h"
 #include "video_out_internal.h"
 #include "aspect.h"
-#include "postproc/swscale.h"
+#include "libswscale/swscale.h"
 #include "libmpcodecs/vf_scale.h"
 #include "font_load.h"
 #include "sub.h"

Modified: trunk/libvo/vo_vesa.c
==============================================================================
--- trunk/libvo/vo_vesa.c	(original)
+++ trunk/libvo/vo_vesa.c	Fri Jun 30 14:00:31 2006
@@ -47,7 +47,7 @@
 #endif
 #include "mp_msg.h"
 
-#include "postproc/swscale.h"
+#include "libswscale/swscale.h"
 #include "libmpcodecs/vf_scale.h"
 
 

Modified: trunk/libvo/vo_x11.c
==============================================================================
--- trunk/libvo/vo_x11.c	(original)
+++ trunk/libvo/vo_x11.c	Fri Jun 30 14:00:31 2006
@@ -38,7 +38,7 @@
 #include "fastmemcpy.h"
 #include "sub.h"
 
-#include "postproc/swscale.h"
+#include "libswscale/swscale.h"
 #include "libmpcodecs/vf_scale.h"
 #define MODE_RGB  0x1
 #define MODE_BGR  0x2

Modified: trunk/libvo/vo_yuv4mpeg.c
==============================================================================
--- trunk/libvo/vo_yuv4mpeg.c	(original)
+++ trunk/libvo/vo_yuv4mpeg.c	Fri Jun 30 14:00:31 2006
@@ -39,7 +39,7 @@
 #include "sub.h"
 
 #include "fastmemcpy.h"
-#include "postproc/rgb2rgb.h"
+#include "libswscale/swscale.h"
 #include "libmpcodecs/vf_scale.h"
 
 static vo_info_t info = 

Modified: trunk/spudec.c
==============================================================================
--- trunk/spudec.c	(original)
+++ trunk/spudec.c	Fri Jun 30 14:00:31 2006
@@ -23,7 +23,7 @@
 #include <math.h>
 #include "libvo/video_out.h"
 #include "spudec.h"
-#include "postproc/swscale.h"
+#include "libswscale/swscale.h"
 
 #define MIN(a, b)	((a)<(b)?(a):(b))