mirror of
https://github.com/mpv-player/mpv
synced 2024-10-18 10:25:02 +02:00
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:
parent
ff77510ade
commit
4718dd69fa
@ -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
|
||||
|
@ -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;
|
||||
|
Loading…
Reference in New Issue
Block a user