summaryrefslogtreecommitdiffstats
path: root/TOOLS
diff options
context:
space:
mode:
authordiego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>2007-03-16 23:27:46 +0000
committerdiego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>2007-03-16 23:27:46 +0000
commit4718dd69faec25882ea9ae7bab8f1562781f66bc (patch)
treed99ca7d8cfddfb8ca4f09818ebbba5ff88bfdd07 /TOOLS
parentff77510ade6ae1137d0e3c0b071863837b5cb98c (diff)
downloadmpv-4718dd69faec25882ea9ae7bab8f1562781f66bc.tar.bz2
mpv-4718dd69faec25882ea9ae7bab8f1562781f66bc.tar.xz
Fix linking: libswscale depends on libavutil, verbose was multiply defined...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22646 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'TOOLS')
-rw-r--r--TOOLS/Makefile4
-rw-r--r--TOOLS/subrip.c1
2 files changed, 2 insertions, 3 deletions
diff --git a/TOOLS/Makefile b/TOOLS/Makefile
index ad5f29b92f..c28919b0cc 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 ../libswscale/swscale.o ../libswscale/rgb2rgb.o \
- ../libswscale/yuv2rgb.o ../libmpcodecs/img_format.o -lm
+ ../unrarlib.o ../libswscale/libswscale.a ../libavutil/libavutil.a \
+ ../libmpcodecs/img_format.o ../osdep/getch2.o -ltermcap -lm
vivodump: vivodump.c
$(CC) $(CFLAGS) -o $@ $< ../mp_msg.o ../libmpdemux/libmpdemux.a ../stream/stream.a
diff --git a/TOOLS/subrip.c b/TOOLS/subrip.c
index fe29652976..f05e6181ba 100644
--- a/TOOLS/subrip.c
+++ b/TOOLS/subrip.c
@@ -74,7 +74,6 @@ typedef struct {
int use_gui;
int gtkMessageBox;
-int verbose=1;
int identify=0;
int vobsub_id=0;
int sub_pos=0;