Mercurial > mplayer.hg

changeset 22628:0334e714d3fa

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix linking: libswscale depends on libavutil, verbose was multiply defined...
author diego
date Fri, 16 Mar 2007 23:27:46 +0000
parents b5e31dca2b0b
children f95573b7da55
files TOOLS/Makefile TOOLS/subrip.c
diffstat 2 files changed, 2 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/TOOLS/Makefile	Fri Mar 16 22:47:23 2007 +0000
+++ b/TOOLS/Makefile	Fri Mar 16 23:27:46 2007 +0000
@@ -27,8 +27,8 @@
 
 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
--- a/TOOLS/subrip.c	Fri Mar 16 22:47:23 2007 +0000
+++ b/TOOLS/subrip.c	Fri Mar 16 23:27:46 2007 +0000
@@ -74,7 +74,6 @@
 
 int use_gui;
 int gtkMessageBox;
-int verbose=1;
 int identify=0;
 int vobsub_id=0;
 int sub_pos=0;