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
This commit is contained in:
diego 2007-03-16 23:27:46 +00:00
parent ff77510ade
commit 4718dd69fa
2 changed files with 2 additions and 3 deletions

View File

@ -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

View File

@ -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;