Mercurial > mplayer.hg

changeset 26672:93c199383f94

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
FFmpeg parts no longer require extra -I CFLAGS.
author diego
date Fri, 09 May 2008 12:39:04 +0000
parents 24e6708e030c
children 8565e33b61f3
files Makefile configure
diffstat 2 files changed, 1 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/Makefile	Fri May 09 12:38:33 2008 +0000
+++ b/Makefile	Fri May 09 12:39:04 2008 +0000
@@ -772,8 +772,6 @@
 libdvdcss/%.o libdvdcss/%.d: CFLAGS += -D__USE_UNIX98 -D_GNU_SOURCE -DVERSION=\"1.2.9\"
 libfaad2/%.o libfaad2/%.d: CFLAGS += -Ilibfaad2 -D_GNU_SOURCE
 
-libmpdemux/demux_lavf.o libmpdemux/demux_lavf.d libmpdemux/mp_taglists.o libmpdemux/mp_taglists.d: CFLAGS += -Ilibavcodec
-
 loader/% loader/%: CFLAGS += -Iloader -fno-omit-frame-pointer $(CFLAG_NO_OMIT_LEAF_FRAME_POINTER)
 #loader/%.o loader/%.d: CFLAGS += -Ddbg_printf=__vprintf -DTRACE=__vprintf -DDETAILED_OUT
 loader/win32.o loader/win32.d: CFLAGS += $(CFLAG_STACKREALIGN)
--- a/configure	Fri May 09 12:38:33 2008 +0000
+++ b/configure	Fri May 09 12:39:04 2008 +0000
@@ -7527,7 +7527,7 @@
   CFLAGS="$CFLAGS -DHAVE_CONFIG_H"
 fi
 
-CFLAGS="-I. -Ilibavutil $CFLAGS"
+CFLAGS="-I. $CFLAGS"
 CXXFLAGS=" $CFLAGS -D__STDC_LIMIT_MACROS"
 
 cat > $TMPC << EOF