Contribs: deactivate libavcodec vorbis encoder

[vlc] / contrib / src / ffmpeg / rules.mak

diff --git a/contrib/src/ffmpeg/rules.mak b/contrib/src/ffmpeg/rules.mak
index b6441d97d18734f9ea28c928c8fc4019ee0277cb..5a16552c434ff4a092f4df3648b487bee07431c4 100644 (file)
--- a/contrib/src/ffmpeg/rules.mak
+++ b/contrib/src/ffmpeg/rules.mak
@@ -1,58 +1,72 @@
 # FFmpeg
 
-FFMPEG_SNAPURL := http://git.videolan.org/?p=ffmpeg.git;a=snapshot;h=HEAD;sf=tgz
-#FFMPEG_SNAPURL := http://git.libav.org/?p=libav.git;a=snapshot;h=HEAD;sf=tgz
+#FFMPEG_SNAPURL := http://git.videolan.org/?p=ffmpeg.git;a=snapshot;h=HEAD;sf=tgz
+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 \
+       --disable-encoder=vorbis \
        --enable-libgsm \
-       --enable-libvpx \
        --enable-libopenjpeg \
        --disable-debug \
-       --enable-gpl \
-       --enable-postproc \
-       --disable-ffprobe \
-       --disable-ffserver \
-       --disable-ffmpeg \
-       --disable-ffplay \
-       --disable-avconv \
+       --disable-avdevice \
        --disable-devices \
-       --disable-protocols \
        --disable-avfilter \
-       --disable-network
-DEPS_ffmpeg = zlib gsm vpx $(DEPS_vpx) openjpeg
+       --disable-filters \
+       --disable-bsfs \
+       --disable-bzlib
+
+# Those tools are named differently in FFmpeg and Libav
+#      --disable-ffserver \
+#      --disable-ffplay \
+#      --disable-ffprobe
+DEPS_ffmpeg = zlib gsm openjpeg
 
 # Optional dependencies
 ifdef BUILD_ENCODERS
-FFMPEGCONF += --enable-libmp3lame
-DEPS_ffmpeg += lame $(DEPS_lame)
+FFMPEGCONF += --enable-libmp3lame --enable-libvpx --disable-decoder=libvpx
+DEPS_ffmpeg += lame $(DEPS_lame) vpx $(DEPS_vpx)
 else
 FFMPEGCONF += --disable-encoders --disable-muxers
-# XXX: REVISIT --enable-small ?
 endif
 
-# XXX: REVISIT
-#ifndef HAVE_FPU
-#FFMPEGCONF += --disable-mpegaudio-hp
-#endif
+# Small size
+ifdef ENABLE_SMALL
+FFMPEGCONF += --enable-small --optflags=-O2
+ifeq ($(ARCH),arm)
+ifdef HAVE_ARMV7A
+# XXX: assumes > ARMv7-A, and thus thumb2-able
+FFMPEGCONF += --enable-thumb
+endif
+endif
+endif
 
 ifdef HAVE_CROSS_COMPILE
-FFMPEGCONF += --enable-cross-compile --cross-prefix=$(HOST)-
+FFMPEGCONF += --enable-cross-compile
+ifndef HAVE_IOS
+FFMPEGCONF += --cross-prefix=$(HOST)-
+endif
 endif
 
 # ARM stuff
 ifeq ($(ARCH),arm)
-FFMPEGCONF += --disable-runtime-cpudetect
+FFMPEGCONF += --arch=arm
+ifdef HAVE_NEON
+FFMPEGCONF += --cpu=cortex-a8 --enable-neon
+FFMPEG_CFLAGS += -mfpu=neon
+endif
+endif
+
+# x86 stuff
+ifeq ($(ARCH),i386)
+FFMPEGCONF += --arch=x86
 endif
 
 # Darwin
 ifdef HAVE_DARWIN_OS
 FFMPEGCONF += --arch=$(ARCH) --target-os=darwin
-FFMPEG_CFLAGS += -DHAVE_LRINTF
-endif
-ifdef HAVE_MACOSX
 ifneq ($(findstring $(ARCH),i386 x86_64),)
 FFMPEGCONF += --enable-memalign-hack
 endif
@@ -60,43 +74,49 @@ ifeq ($(ARCH),x86_64)
 FFMPEGCONF += --cpu=core2
 endif
 endif
+ifdef HAVE_IOS
+FFMPEGCONF += --enable-pic --as="$(AS)"
+endif
 
 # Linux
 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
+# handled by __attribute__((force_align_arg_pointer)) in libavcodec
+# already, so we tell gcc to assume this alignment, so we don't need
+# to waste a precious register in assembly functions to realign it.
+FFMPEG_CFLAGS += -mincoming-stack-boundary=4
+endif # HAVE_ANDROID
+endif # x86
+
 endif
 
 # Windows
 ifdef HAVE_WIN32
+ifndef HAVE_MINGW_W64
 DEPS_ffmpeg += directx
+endif
 FFMPEGCONF += --target-os=mingw32 --enable-memalign-hack
-FFMPEGCONF += --enable-w32threads \
-       --disable-bzlib --disable-bsfs \
-       --disable-decoder=dca --disable-encoder=vorbis \
-       --enable-dxva2
+FFMPEGCONF += --enable-w32threads --enable-dxva2 \
+       --disable-decoder=dca
 
 ifdef HAVE_WIN64
 FFMPEGCONF += --cpu=athlon64 --arch=x86_64
 else # !WIN64
 FFMPEGCONF+= --cpu=i686 --arch=x86
 endif
-else
-FFMPEGCONF += --enable-pthreads
-endif
 
-ifdef HAVE_WINCE
-FFMPEGCONF += --target-os=mingw32ce --arch=armv4l --cpu=armv4t \
-       --disable-decoder=snow --disable-decoder=vc9 \
-       --disable-decoder=wmv3 --disable-decoder=vorbis \
-       --disable-decoder=dvdsub --disable-decoder=dvbsub
+else # !Windows
+FFMPEGCONF += --enable-pthreads
 endif
 
-FFMPEG_CFLAGS += --std=gnu99
-
 # Build
-
 PKGS += ffmpeg
-ifeq ($(call need_pkg,"libavcodec libavformat libswscale"),)
+ifeq ($(call need_pkg,"libavcodec >= 52.25.0 libavformat >= 52.30.0 libswscale"),)
 PKGS_FOUND += ffmpeg
 endif
 
@@ -112,15 +132,11 @@ FFMPEG_VERSION := git
 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
+       $(ZCAT) "$<" | (cd $@-git && tar xv --strip-components=1)
        $(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