summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordiego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>2008-05-09 12:39:04 +0000
committerdiego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>2008-05-09 12:39:04 +0000
commitf6318795defbcdc06d65343c7a8478b8ef6906f9 (patch)
treef421b55670b2bdda8590fc18b3ed7fa6f5261278
parent0b1b4814a8628f5c1d66fe3525bc0ff3977cec55 (diff)
downloadmpv-f6318795defbcdc06d65343c7a8478b8ef6906f9.tar.bz2
mpv-f6318795defbcdc06d65343c7a8478b8ef6906f9.tar.xz
FFmpeg parts no longer require extra -I CFLAGS.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26704 b3059339-0415-0410-9bf9-f77b7e298cf2
-rw-r--r--Makefile2
-rwxr-xr-xconfigure2
2 files changed, 1 insertions, 3 deletions
diff --git a/Makefile b/Makefile
index 6bf6955f4d..0783f866d9 100644
--- a/Makefile
+++ b/Makefile
@@ -772,8 +772,6 @@ dvdread/%.o dvdread/%.d: CFLAGS += -D__USE_UNIX98 -D_GNU_SOURCE $(LIBDVDCSS_DVDR
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)
diff --git a/configure b/configure
index 76465d0060..891347d39c 100755
--- a/configure
+++ b/configure
@@ -7527,7 +7527,7 @@ if test "$_dvdread_internal" = yes || test "$_faad_internal" = yes ; then
CFLAGS="$CFLAGS -DHAVE_CONFIG_H"
fi
-CFLAGS="-I. -Ilibavutil $CFLAGS"
+CFLAGS="-I. $CFLAGS"
CXXFLAGS=" $CFLAGS -D__STDC_LIMIT_MACROS"
cat > $TMPC << EOF