[vlc-commits] Contribs: more cleanups for libav/FFmpeg

[Jean-Baptiste Kempf]

vlc | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Wed Oct 10 17:21:26 2012 +0200| [b389b4f1ea312e78a6ac875ca56aac07f98e7630] | committer: Jean-Baptiste Kempf

Contribs: more cleanups for libav/FFmpeg

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=b389b4f1ea312e78a6ac875ca56aac07f98e7630
---

 contrib/src/ffmpeg/rules.mak |   15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/contrib/src/ffmpeg/rules.mak b/contrib/src/ffmpeg/rules.mak
index 6e10028..3ab782d 100644
--- a/contrib/src/ffmpeg/rules.mak
+++ b/contrib/src/ffmpeg/rules.mak
@@ -13,7 +13,9 @@ FFMPEGCONF = \
 	--disable-avdevice \
 	--disable-devices \
 	--disable-avfilter \
-	--disable-filters
+	--disable-filters \
+	--disable-bsfs \
+	--disable-bzlib
 
 # Those tools are named differently in FFmpeg and Libav
 #	--disable-ffserver \
@@ -29,6 +31,7 @@ else
 FFMPEGCONF += --disable-encoders --disable-muxers
 endif
 
+# Small size
 ifdef ENABLE_SMALL
 FFMPEGCONF += --enable-small --optflags=-O2
 ifeq ($(ARCH),arm)
@@ -63,7 +66,6 @@ endif
 # Darwin
 ifdef HAVE_DARWIN_OS
 FFMPEGCONF += --arch=$(ARCH) --target-os=darwin
-FFMPEG_CFLAGS += -DHAVE_LRINTF
 ifneq ($(findstring $(ARCH),i386 x86_64),)
 FFMPEGCONF += --enable-memalign-hack
 endif
@@ -79,6 +81,7 @@ endif
 ifdef HAVE_LINUX
 FFMPEGCONF += --target-os=linux --enable-pic
 
+# Android x86
 ifeq ($(ANDROID_ABI), x86)
 ifdef HAVE_ANDROID
 # Android-x86 gcc doesn't guarantee an aligned stack, but this is
@@ -97,22 +100,20 @@ ifndef HAVE_MINGW_W64
 DEPS_ffmpeg += directx
 endif
 FFMPEGCONF += --target-os=mingw32 --enable-memalign-hack
-FFMPEGCONF += --enable-w32threads \
-	--disable-bzlib --disable-bsfs \
+FFMPEGCONF += --enable-w32threads --enable-dxva2 \
 	--disable-decoder=dca --disable-encoder=vorbis \
-	--enable-dxva2
 
 ifdef HAVE_WIN64
 FFMPEGCONF += --cpu=athlon64 --arch=x86_64
 else # !WIN64
 FFMPEGCONF+= --cpu=i686 --arch=x86
 endif
-else
+
+else # !Windows
 FFMPEGCONF += --enable-pthreads
 endif
 
 # Build
-
 PKGS += ffmpeg
 ifeq ($(call need_pkg,"libavcodec >= 52.25.0 libavformat >= 52.30.0 libswscale"),)
 PKGS_FOUND += ffmpeg