Author: diego Date: Fri Jun 30 14:40:05 2006 New Revision: 18868 Modified: trunk/Gui/wm/ws.c trunk/TOOLS/Makefile trunk/TOOLS/mwallp/compile.sh trunk/TOOLS/subrip.c Log: postproc --> libswscale Modified: trunk/Gui/wm/ws.c ============================================================================== --- trunk/Gui/wm/ws.c (original) +++ trunk/Gui/wm/ws.c Fri Jun 30 14:40:05 2006 @@ -25,7 +25,7 @@ #include "wsxdnd.h" #include "../cpudetect.h" #include "../libswscale/swscale.h" -#include "../postproc/rgb2rgb.h" +#include "../libswscale/rgb2rgb.h" #include "../libmpcodecs/vf_scale.h" #include "../mp_msg.h" #include "../help_mp.h" Modified: trunk/TOOLS/Makefile ============================================================================== --- trunk/TOOLS/Makefile (original) +++ trunk/TOOLS/Makefile Fri Jun 30 14:40:05 2006 @@ -27,8 +27,8 @@ subrip: subrip.c $(CC) $(CFLAGS) -g -o $@ $< ../vobsub.o ../spudec.o ../mp_msg.o \ - ../unrarlib.o ../postproc/swscale.o ../postproc/rgb2rgb.o \ - ../postproc/yuv2rgb.o ../libmpcodecs/img_format.o -lm + ../unrarlib.o ../libswscale/swscale.o ../libswscale/rgb2rgb.o \ + ../libswscale/yuv2rgb.o ../libmpcodecs/img_format.o -lm vivodump: vivodump.c $(CC) $(CFLAGS) -o $@ $< ../mp_msg.o ../libmpdemux/libmpdemux.a Modified: trunk/TOOLS/mwallp/compile.sh ============================================================================== --- trunk/TOOLS/mwallp/compile.sh (original) +++ trunk/TOOLS/mwallp/compile.sh Fri Jun 30 14:40:05 2006 @@ -1,6 +1,6 @@ echo gcc -g mwallp.c jpeg.c ../../libvo/aclib.o ../../libmpcodecs/img_format.o \ ../../cpudetect.o ../../mp_msg-mencoder.o ../../libavcodec/libavcodec.a \ - ../../postproc/libswscale.a ../../osdep/libosdep.a \ - -I../../libmpcodecs -I../.. -I../../postproc \ + ../../libswscale/libswscale.a ../../osdep/libosdep.a \ + -I../../libmpcodecs -I../.. -I../../libswscale \ -L/usr/X11/lib -L/usr/X11R6/lib -lX11 -lm -ljpeg -o mwallp Modified: trunk/TOOLS/subrip.c ============================================================================== --- trunk/TOOLS/subrip.c (original) +++ trunk/TOOLS/subrip.c Fri Jun 30 14:40:05 2006 @@ -1,4 +1,4 @@ -/* -*- compile-command: "gcc -g -Wall -I.. -o subrip subrip.c ../vobsub.o ../spudec.o ../mp_msg.o ../unrarlib.o ../postproc/swscale.o ../postproc/rgb2rgb.o ../postproc/yuv2rgb.o ../libmpcodecs/img_format.o -lm" -*- */ +/* -*- compile-command: "gcc -g -Wall -I.. -o subrip subrip.c ../vobsub.o ../spudec.o ../mp_msg.o ../unrarlib.o ../libswscale/swscale.o ../libswscale/rgb2rgb.o ../libswscale/yuv2rgb.o ../libmpcodecs/img_format.o -lm" -*- */ /* * Use with CVS JOCR/GOCR. *