[MPlayer-cvslog] r26704 - in trunk: Makefile configure

[diego]

Author: diego
Date: Fri May  9 14:39:04 2008
New Revision: 26704

Log:
FFmpeg parts no longer require extra -I CFLAGS.


Modified:
   trunk/Makefile
   trunk/configure

Modified: trunk/Makefile
==============================================================================
--- trunk/Makefile	(original)
+++ trunk/Makefile	Fri May  9 14:39:04 2008
@@ -772,8 +772,6 @@ dvdread/%.o dvdread/%.d: CFLAGS += -D__U
 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)

Modified: trunk/configure
==============================================================================
--- trunk/configure	(original)
+++ trunk/configure	Fri May  9 14:39:04 2008
@@ -7527,7 +7527,7 @@ if test "$_dvdread_internal" = yes || te
   CFLAGS="$CFLAGS -DHAVE_CONFIG_H"
 fi
 
-CFLAGS="-I. -Ilibavutil $CFLAGS"
+CFLAGS="-I. $CFLAGS"
 CXXFLAGS=" $CFLAGS -D__STDC_LIMIT_MACROS"
 
 cat > $TMPC << EOF