Move postproc ---> libswscale

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18866 b3059339-0415-0410-9bf9-f77b7e298cf2

Gui/wm/ws.c

@@ -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"

Makefile

@@ -110,7 +110,7 @@ COMMON_LIBS = libmpcodecs/libmpcodecs.a \
               $(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 @@ PARTS = libmpdemux \
         libavcodec \
         libpostproc \
         libavformat \
+        libswscale \
         libao2 \
         osdep \
-        postproc \
         input \
         libvo \
         libaf \
@@ -218,7 +218,7 @@ COMMON_DEPS = $(W32_DEP) \
               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 @@ libpostproc/libpostproc.a:
 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 @@ Gui/libgui.a:
 osdep/libosdep.a:
 	$(MAKE) -C osdep
 
-postproc/libswscale.a:
-	$(MAKE) -C postproc
-
 input/libinput.a:
 	$(MAKE) -C input
 
@@ -583,7 +583,7 @@ libmpcodecs/libmpencoders.a: $(wildcard libmpcodecs/*.[ch])
 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])

libmpcodecs/vf_halfpack.c

@@ -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;

libmpcodecs/vf_palette.c

@@ -11,7 +11,7 @@
 #include "mp_image.h"
 #include "vf.h"
 
-#include "postproc/rgb2rgb.h"
+#include "libswscale/rgb2rgb.h"
 
 //===========================================================================//
 

libmpcodecs/vf_rgb2bgr.c

@@ -11,7 +11,7 @@
 #include "vf.h"
 
 #include "libvo/fastmemcpy.h"
-#include "postproc/rgb2rgb.h"
+#include "libswscale/rgb2rgb.h"
 
 //===========================================================================//
 

libmpcodecs/vf_sab.c

@@ -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"
 
 

libmpcodecs/vf_scale.c

@@ -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"

libmpcodecs/vf_screenshot.c

@@ -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;

libmpcodecs/vf_smartblur.c

@@ -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"
 
 //===========================================================================//

libmpcodecs/vf_yuy2.c

@@ -12,7 +12,7 @@
 #include "vf.h"
 
 #include "libvo/fastmemcpy.h"
-#include "postproc/rgb2rgb.h"
+#include "libswscale/rgb2rgb.h"
 #include "vf_scale.h"
 
 //===========================================================================//

libvo/mga_common.c

@@ -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"

libvo/vo_aa.c

@@ -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"

libvo/vo_vesa.c

@@ -47,7 +47,7 @@
 #endif
 #include "mp_msg.h"
 
-#include "postproc/swscale.h"
+#include "libswscale/swscale.h"
 #include "libmpcodecs/vf_scale.h"
 
 

libvo/vo_x11.c

@@ -38,7 +38,7 @@ int XShmGetEventBase(Display *);
 #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

libvo/vo_yuv4mpeg.c

@@ -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 = 

spudec.c

@@ -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))