summaryrefslogtreecommitdiffstats
path: root/TOOLS
diff options
context:
space:
mode:
authordiego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>2006-06-30 12:40:05 +0000
committerdiego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>2006-06-30 12:40:05 +0000
commit52b8a22453c87bb987e371fb3ebacf0d231a7fc9 (patch)
tree2767c720227c3f53743ee135a6cd8f672dca42e6 /TOOLS
parentd4d3146c8a3c7151e01e0a7332ea8bb5356d7a9f (diff)
downloadmpv-52b8a22453c87bb987e371fb3ebacf0d231a7fc9.tar.bz2
mpv-52b8a22453c87bb987e371fb3ebacf0d231a7fc9.tar.xz
postproc --> libswscale
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18868 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'TOOLS')
-rw-r--r--TOOLS/Makefile4
-rwxr-xr-xTOOLS/mwallp/compile.sh4
-rw-r--r--TOOLS/subrip.c2
3 files changed, 5 insertions, 5 deletions
diff --git a/TOOLS/Makefile b/TOOLS/Makefile
index ca059a700a..817fe33a23 100644
--- a/TOOLS/Makefile
+++ b/TOOLS/Makefile
@@ -27,8 +27,8 @@ png2raw: png2raw.c
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
diff --git a/TOOLS/mwallp/compile.sh b/TOOLS/mwallp/compile.sh
index 7dc19f4e51..6ef2d20c44 100755
--- a/TOOLS/mwallp/compile.sh
+++ b/TOOLS/mwallp/compile.sh
@@ -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
diff --git a/TOOLS/subrip.c b/TOOLS/subrip.c
index 3103e2a5a0..fe29652976 100644
--- a/TOOLS/subrip.c
+++ b/TOOLS/subrip.c
@@ -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.
*