[vlc-commits] Contribs: simplify libav/FFmpeg rules as suggested by DonDiego
Jean-Baptiste Kempf
git at videolan.org
Wed Oct 10 16:34:13 CEST 2012
vlc | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Wed Oct 10 16:25:13 2012 +0200| [14fa9f281c28432811f2804c29c2061ca6c127cb] | committer: Jean-Baptiste Kempf
Contribs: simplify libav/FFmpeg rules as suggested by DonDiego
> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=14fa9f281c28432811f2804c29c2061ca6c127cb
---
contrib/src/ffmpeg/rules.mak | 14 +-------------
1 file changed, 1 insertion(+), 13 deletions(-)
diff --git a/contrib/src/ffmpeg/rules.mak b/contrib/src/ffmpeg/rules.mak
index 04de268..6e10028 100644
--- a/contrib/src/ffmpeg/rules.mak
+++ b/contrib/src/ffmpeg/rules.mak
@@ -6,7 +6,6 @@ FFMPEG_SNAPURL := http://git.libav.org/?p=libav.git;a=snapshot;h=HEAD;sf=tgz
FFMPEGCONF = \
--cc="$(CC)" \
--disable-doc \
- --disable-decoder=libvpx \
--disable-decoder=bink \
--enable-libgsm \
--enable-libopenjpeg \
@@ -24,7 +23,7 @@ DEPS_ffmpeg = zlib gsm openjpeg
# Optional dependencies
ifdef BUILD_ENCODERS
-FFMPEGCONF += --enable-libmp3lame --enable-libvpx
+FFMPEGCONF += --enable-libmp3lame --enable-libvpx --disable-decoder=libvpx
DEPS_ffmpeg += lame $(DEPS_lame) vpx $(DEPS_vpx)
else
FFMPEGCONF += --disable-encoders --disable-muxers
@@ -40,11 +39,6 @@ endif
endif
endif
-# XXX: REVISIT
-#ifndef HAVE_FPU
-#FFMPEGCONF += --disable-mpegaudio-hp
-#endif
-
ifdef HAVE_CROSS_COMPILE
FFMPEGCONF += --enable-cross-compile
ifndef HAVE_IOS
@@ -117,8 +111,6 @@ else
FFMPEGCONF += --enable-pthreads
endif
-FFMPEG_CFLAGS += --std=gnu99
-
# Build
PKGS += ffmpeg
@@ -139,14 +131,10 @@ ffmpeg: ffmpeg-$(FFMPEG_VERSION).tar.gz .sum-ffmpeg
rm -Rf $@ $@-git
mkdir -p $@-git
$(ZCAT) "$<" | (cd $@-git && tar xv --strip-components=1)
-ifdef HAVE_WIN32
- sed -i "s/std=c99/std=gnu99/" $@-$(FFMPEG_VERSION)/configure
-endif
$(MOVE)
.ffmpeg: ffmpeg
cd $< && $(HOSTVARS) ./configure \
- --extra-cflags="$(FFMPEG_CFLAGS) -DHAVE_STDINT_H" \
--extra-ldflags="$(LDFLAGS)" $(FFMPEGCONF) \
--prefix="$(PREFIX)" --enable-static --disable-shared
cd $< && $(MAKE) install-libs install-headers
More information about the vlc-commits
mailing list