Mercurial > mplayer.hg
annotate Gui/Makefile @ 14843:bbb693d3b130
Fix the ogg fourcc nightmare!!!
The problem: once upon a time, windows idiots decided to try to store
vorbis-in-ogg-in-avi. Of course this failed miserably, but they used
the audio format tag 0xfffe for "extended" to do this. Later someone
working on MPlayer somehow decided 0xfffe was the format for vorbis,
which is nonsense, and now that's conflicting with real wav files with
extended audio format. This patch changes demux_ogg (and mkv) to use
sane fourcc's for vorbis and theora and gets rid of the 0xfffe
nonsense so hopefully wav files with extended audio will work now.
If there are problems, we'll have to find workarounds...and drive an
18-wheeler full of cola thru the house of whoever wrote this 0xfffe
nonsense in MPlayer to begin with...
author | rfelker |
---|---|
date | Sun, 27 Feb 2005 18:11:17 +0000 |
parents | e047e70a9767 |
children | 7af5fe0860a1 |
rev | line source |
---|---|
1693 | 1 |
2 LIB = libgui.a | |
3 | |
4 include ../config.mak | |
5 include config.mak | |
6 | |
13787
e047e70a9767
Handle "xxx.h" vs "../xxx.h" include paths in a consistent way.
diego
parents:
12707
diff
changeset
|
7 INCDIR = -I. -I.. -I../loader -I./wm -I./skin $(FREETYPE_INC) $(GTKINC) $(EXTRA_INC) |
1693 | 8 |
8976 | 9 OPTIMIZE = $(OPTFLAGS) \ |
8273
226e6866212d
reversing my patch to check for -Wall support & use it if available (requested by A'rpi)
rathann
parents:
8255
diff
changeset
|
10 -fexpensive-optimizations -fschedule-insns2 -Wall |
1693 | 11 |
12 CFLAGS = $(OPTIMIZE) $(INCDIR) $(DEBUG) | |
13 | |
8058 | 14 SRCS = wm/ws.c wm/wsxdnd.c app.c interface.c cfg.c bitmap.c \ |
6625 | 15 skin/skin.c skin/font.c skin/cut.c \ |
8973 | 16 mplayer/widgets.c mplayer/play.c mplayer/mw.c mplayer/sw.c mplayer/menu.c mplayer/pb.c mplayer/common.c \ |
8181 | 17 mplayer/gtk/menu.c mplayer/gtk/mb.c mplayer/gtk/about.c mplayer/gtk/pl.c mplayer/gtk/sb.c mplayer/gtk/fs.c mplayer/gtk/opts.c mplayer/gtk/url.c mplayer/gtk/eq.c mplayer/gtk/common.c |
6625 | 18 OBJS = $(SRCS:.c=.o) |
19 | |
1693 | 20 .SUFFIXES: .c .o |
21 | |
22 .c.o: | |
23 $(CC) -c $(CFLAGS) -o $@ $< | |
24 | |
25 ### TARGETS ### | |
26 | |
27 $(LIB): .depend $(OBJS) | |
28 rm -f $(LIB) | |
6036 | 29 $(AR) rc $(LIB) $(OBJS) $(MPLAYEROBJS) |
12632 | 30 $(RANLIB) $(LIB) |
1693 | 31 |
32 all: $(LIB) | |
33 | |
34 clean: | |
12707 | 35 rm -rf $(OBJS) *.o *~ *.bak main $(LIB) .depend |
1693 | 36 |
37 #dep: depend | |
38 # | |
39 #depend: | |
40 # makedepend -- $(CFLAGS) -- $(SRCS) &>/dev/null | |
41 # | |
42 | |
43 distclean: clean | |
44 | |
45 dep: depend | |
46 | |
47 depend: .depend | |
48 | |
6625 | 49 .depend: Makefile config.mak |
1693 | 50 $(CC) -MM $(CFLAGS) $(SRCS) 1>.depend |
51 | |
52 # | |
53 # include dependency files if they exist | |
54 # | |
55 ifneq ($(wildcard .depend),) | |
56 include .depend | |
57 endif |