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 15aabafbc1ce17ca4422da0649cf4ee2add775af..5a16552c434ff4a092f4df3648b487bee07431c4 100644 (file)
--- a/contrib/src/ffmpeg/rules.mak
+++ b/contrib/src/ffmpeg/rules.mak
@@ -6,15 +6,17 @@ 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-libopenjpeg \
        --disable-debug \
        --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 \
@@ -24,27 +26,23 @@ 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
 endif
 
+# Small size
 ifdef ENABLE_SMALL
 FFMPEGCONF += --enable-small --optflags=-O2
 ifeq ($(ARCH),arm)
-ifdef HAVE_NEON
-# XXX: assumes CPU >= cortex-a8, and thus thumb2 able
+ifdef HAVE_ARMV7A
+# XXX: assumes > ARMv7-A, and thus thumb2-able
 FFMPEGCONF += --enable-thumb
 endif
 endif
 endif
 
-# XXX: REVISIT
-#ifndef HAVE_FPU
-#FFMPEGCONF += --disable-mpegaudio-hp
-#endif
-
 ifdef HAVE_CROSS_COMPILE
 FFMPEGCONF += --enable-cross-compile
 ifndef HAVE_IOS
@@ -54,10 +52,10 @@ endif
 
 # ARM stuff
 ifeq ($(ARCH),arm)
-FFMPEGCONF += --disable-runtime-cpudetect --arch=arm
+FFMPEGCONF += --arch=arm
 ifdef HAVE_NEON
 FFMPEGCONF += --cpu=cortex-a8 --enable-neon
-FFMPEG_CFLAGS +=-mfloat-abi=softfp -mfpu=neon
+FFMPEG_CFLAGS += -mfpu=neon
 endif
 endif
 
@@ -69,7 +67,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
@@ -78,13 +75,14 @@ FFMPEGCONF += --cpu=core2
 endif
 endif
 ifdef HAVE_IOS
-FFMPEGCONF += --enable-pic --as="$(AS)" --disable-decoder=snow
+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
@@ -103,31 +101,20 @@ 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 >= 52.25.0 libavformat >= 52.30.0 libswscale"),)
 PKGS_FOUND += ffmpeg
@@ -146,14 +133,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