From 4718dd69faec25882ea9ae7bab8f1562781f66bc Mon Sep 17 00:00:00 2001
From: diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>
Date: Fri, 16 Mar 2007 23:27:46 +0000
Subject: 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
---
 TOOLS/Makefile | 4 ++--
 TOOLS/subrip.c | 1 -
 2 files changed, 2 insertions(+), 3 deletions(-)

(limited to 'TOOLS')

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;
-- 
cgit v1.2.3