[MPlayer-cvslog] r22646 - in trunk/TOOLS: Makefile subrip.c

[diego]

Author: diego
Date: Sat Mar 17 00:27:46 2007
New Revision: 22646

Modified:
   trunk/TOOLS/Makefile
   trunk/TOOLS/subrip.c

Log:
Fix linking: libswscale depends on libavutil, verbose was multiply defined...


Modified: trunk/TOOLS/Makefile
==============================================================================
--- trunk/TOOLS/Makefile	(original)
+++ trunk/TOOLS/Makefile	Sat Mar 17 00:27:46 2007
@@ -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

Modified: trunk/TOOLS/subrip.c
==============================================================================
--- trunk/TOOLS/subrip.c	(original)
+++ trunk/TOOLS/subrip.c	Sat Mar 17 00:27:46 2007
@@ -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;