ffmpeg: version bump r12314 -> 4.1.3

Note: The configuration options are chosen to only enable the features
needed by gst-libav.

Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>

4 files changed, 230 insertions, 710 deletions

diff --git a/patches/ffmpeg-r12314/configure_cpu_type_cortex.diff b/patches/ffmpeg-r12314/configure_cpu_type_cortex.diff
deleted file mode 100644
index 81281674f..000000000
--- a/patches/ffmpeg-r12314/configure_cpu_type_cortex.diff
+++ /dev/null
@@ -1,25 +0,0 @@
-From: Luotao Fu <l.fu@pengutronix.de>
-Subject: add cortex* cpus to cpu selections in configure script
-
-This one makes the configure script take the cortex* cpu types, as i.E. used in
-OMAP3 processors, and set the correct gcc flag.
-
-Signed-off-by: Luotao Fu <l.fu@pengutronix.de>
----
- configure |    3 +++
- 1 file changed, 3 insertions(+)
-
-Index: configure
-===================================================================
---- configure.orig
-+++ configure
-@@ -1464,6 +1464,9 @@ if test $cpu != "generic"; then
-         arm*)
-             add_cflags "-mcpu=$cpu"
-         ;;
-+        cortex*)
-+            add_cflags "-mcpu=$cpu"
-+        ;;
-         *)
-             echo "WARNING: Unknown CPU \"$cpu\", ignored."
-         ;;
diff --git a/patches/ffmpeg-r12314/series b/patches/ffmpeg-r12314/series
deleted file mode 100644
index 66225acdd..000000000
--- a/patches/ffmpeg-r12314/series
+++ /dev/null
@@ -1 +0,0 @@
-configure_cpu_type_cortex.diff -p0
diff --git a/rules/ffmpeg.in b/rules/ffmpeg.in
index b3ba35d85..559ebd18d 100644
--- a/rules/ffmpeg.in
+++ b/rules/ffmpeg.in
@@ -1,312 +1,12 @@
 ## SECTION=applications
 
-menuconfig FFMPEG
+config FFMPEG
 	tristate
-	depends on BROKEN
-	select ZLIB if FFMPEG_ZLIB
-	select SDL if FFMPEG_FFPLAY
-	prompt "ffmpeg                        "
+	select CROSS_NASM
+	prompt "ffmpeg"
 	help
-	  FFmpeg is an audio/video conversion tool.
-	  It includes libavcodec, the leading open
-	  source codec library. An experimental
-	  streaming server for live broadcasts is
-	  also included.
+	  FFmpeg is the leading multimedia framework, able to decode,
+	  encode, transcode, mux, demux, stream, filter and play pretty
+	  much anything that humans and machines have created. It supports
+	  the most obscure ancient formats up to the cutting edge.
 
-if FFMPEG
-
-config FFMPEG_SHARED
-	bool
-	prompt "Build shared libs"
-	help
-	  To build with shared libraries, use both
-	  --enable-shared   and
-	  --disable-static
-
-config FFMPEG_STATIC
-	bool
-	prompt "Build static libs"
-	help
-	  To build with static libraries, use both
-	  --enable-static   and
-	  --disable-shared
-
-config FFMPEG_PTHREADS
-	bool
-	prompt "Use pthreads"
-	help
-	  This switch enables the build to link against
-	  the Posix threads library.
-
-config FFMPEG_FFSERVER
-	bool
-	depends on BROKEN
-	prompt "Build ffserver"
-	help
-	  FFserver is a streaming server for both audio
-	  and video. It supports several live feeds,
-	  streaming from files and time shifting on live
-	  feeds (you can seek to positions in the past
-	  on each live feed, provided you specify a big
-	  enough feed storage in ffserver.conf).
-
-config FFMPEG_FFPLAY
-	bool
-	depends on BROKEN
-	prompt "Build ffplay"
-	help
-	  FFplay is a very simple and portable media
-	  player using the FFmpeg libraries and the
-	  SDL library. It is mostly used as a testbed
-	  for the various FFmpeg APIs.
-
-config FFMPEG_MEMALIGN_HACK
-	bool
-	prompt "Use memalign hack"
-	help
-	  Reportedly, this is a Windows hack. Without this
-	  option ffmpeg always crashes with the message
-	  "removing common factors from framerate" when
-	  encoding AVIs.
-
-config FFMPEG_SMALL
-	bool
-	prompt "Optimize for size"
-	help
-	  Optimize for size instead of speed
-
-config FFMPEG_STRIP
-	bool
-	prompt "Strip executables"
-	help
-	  Stripping of executables and shared libraries
-
-config FFMPEG_GPROF
-	bool
-	prompt "Enable profiling"
-	help
-	  Enable profiling with gprof
-
-config FFMPEG_DEBUG
-	bool
-	prompt "Enable debug"
-	help
-	  Create debugging symbols
-
-config FFMPEG_OPTS
-	bool
-	prompt "Enable optimization"
-	help
-	  Enable compiler optimizations
-
-config FFMPEG_GPL
-	bool
-	prompt "Allow GPL code"
-	help
-	  Allow use of GPL code, the resulting libav*
-	  and ffmpeg will be under GPL
-
-config FFMPEG_MP3LAME
-	bool
-	depends on BROKEN
-	prompt "mp3lame support"
-	help
-	  Enable MP3 encoding via libmp3lame
-
-config FFMPEG_LIBOGG
-	bool
-	depends on BROKEN
-	prompt "libogg support"
-	help
-	  Enable Ogg support via libogg
-
-config FFMPEG_VORBIS
-	bool
-	depends on BROKEN
-	prompt "vorbis support"
-	help
-	  Enable Vorbis support via libvorbis
-
-config FFMPEG_THEORA
-	bool
-	depends on BROKEN
-	prompt "theora support"
-	help
-	  Enable Theora support via libtheora.
-	  Theora is a free and open video compression
-	  format from the Xiph.org Foundation.
-	  More information on http://www.theora.org/
-
-config FFMPEG_FAAD
-	bool
-	depends on BROKEN
-	prompt "faad support"
-	help
-	  Enable FAAD support via libfaad
-
-config FFMPEG_FAADBIN
-	bool
-	depends on BROKEN
-	prompt "FAAD runtime linking"
-	help
-	  Build FAAD support with runtime linking
-
-config FFMPEG_FAAC
-	bool
-	depends on BROKEN
-	prompt "FAAC support"
-	help
-	  Enable FAAC support via libfaac
-
-config FFMPEG_LIBGSM
-	bool
-	depends on BROKEN
-	prompt "libgsm support"
-	help
-	  Enable GSM support via libgsm
-
-config FFMPEG_XVID
-	bool
-	depends on BROKEN
-	prompt "XviD support"
-	help
-	  Enable XviD support via xvidcore
-
-config FFMPEG_X264
-	bool
-	depends on BROKEN
-	prompt "X264 support"
-	help
-	  Enable H.264 encoding via x264
-
-config FFMPEG_A52
-	bool
-	depends on BROKEN
-	prompt "A52 support"
-	help
-	  Enable GPLed A52 support
-
-config FFMPEG_A52BIN
-	bool
-	depends on BROKEN
-	prompt "A52 runtime support"
-	help
-	  Open liba52.so.0 at runtime
-
-config FFMPEG_DTS
-	bool
-	depends on BROKEN
-	prompt "DTS support"
-	help
-	  Enable GPLed DTS support
-
-config FFMPEG_PP
-	bool
-	depends on FFMPEG_GPL
-	prompt "Post Prosessing support"
-	help
-	  Enable GPLed postprocessing support
-
-config FFMPEG_AMR_NB
-        bool
-	depends on BROKEN
-        prompt "AMR_NB float audio codec"
-        help
-          Enable amr_nb float audio codec
-
-config FFMPEG_AMR_NB_FIXED
-        bool
-	depends on BROKEN
-        prompt "AMR_NB fixed point audio codec"
-        help
-          Use fixed point for amr-nb codec
-
-config FFMPEG_AMR_WB
-        bool
-	depends on BROKEN
-        prompt "AMR_WB float audio codec"
-        help
-          Enable amr_wb float audio codec
-
-config FFMPEG_AMR_IF2
-        bool
-	depends on BROKEN
-        prompt "AMR_IF2 audio codec"
-        help
-          Enable amr_wb IF2 audio codec
-
-config FFMPEG_DC1394
-        bool
-	depends on BROKEN
-        prompt "IIDC-1394 grabbing"
-        help
-          Enable IIDC-1394 grabbing using libdc1394
-	  and libraw1394
-
-config FFMPEG_AUDIO_OSS
-        bool
-        prompt "OSS Audio support"
-        help
-          Enable OSS (Open Sound System) audio support
-
-config FFMPEG_V4L
-        bool
-        prompt "V4L support"
-        help
-          Enable video4linux grabbing
-
-
-config FFMPEG_V4L2
-        bool
-        prompt "V4L2 support"
-        help
-          Enable video4linux2 grabbing
-
-config FFMPEG_BKTR
-        bool
-        prompt "BKTR support"
-        help
-          Enable bktr video grabbing
-
-config FFMPEG_DV1394
-        bool
-        prompt "DV1394 grabbing support"
-        help
-          Enable DV1394 grabbing
-
-config FFMPEG_NETWORK
-        bool
-        prompt "Network support"
-
-config FFMPEG_ZLIB
-        bool
-	select ZLIB
-        prompt "ZLIB support"
-        help
-          Include functionality by zlib compression library
-
-config FFMPEG_SIMPLE_IDCT
-        bool
-        prompt "Simple IDCT support"
-        help
-          Use simple IDCT routines
-
-config FFMPEG_VHOOK
-        bool
-        prompt "video hooking support"
-        help
-          Enable video hooking support
-
-config FFMPEG_MPEGAUDIO_HP
-        bool
-        prompt "Faster MPEG audio decoding support"
-        help
-          Selects faster (but less accurate) MPEG audio decoding
-
-config FFMPEG_PROTOCOL
-        bool
-        prompt "I/O protocols support"
-        help
-          Enable I/O protocols support
-
-endif
diff --git a/rules/ffmpeg.make b/rules/ffmpeg.make
index 4ec726209..695a0da17 100644
--- a/rules/ffmpeg.make
+++ b/rules/ffmpeg.make
@@ -1,14 +1,13 @@
 # -*-makefile-*-
 #
-# Copyright (C) 2006 by Erwin Rol
-#           (C) 2010 by Michael Olbrich <m.olbrich@pengutronix.de>
+# Copyright (C) 2015 by Michael Olbrich <m.olbrich@pengutronix.de>
 #
 # See CREDITS for details about who has contributed to this project.
 #
 # For further information about the PTXdist project and license conditions
 # see the README file.
 #
-#
+
 #
 # We provide this package
 #
@@ -17,354 +16,233 @@ PACKAGES-$(PTXCONF_FFMPEG) += ffmpeg
 #
 # Paths and names
 #
-FFMPEG_VERSION	:= r12314
-FFMPEG_MD5	:=
+FFMPEG_VERSION	:= 4.1.3
+FFMPEG_MD5	:= dcc20dd2682ea01c678b7b8324339d43
 FFMPEG		:= ffmpeg-$(FFMPEG_VERSION)
-FFMPEG_SUFFIX	:= tar.bz2
-FFMPEG_URL	:= http://www.pengutronix.de/software/ptxdist/temporary-src/$(FFMPEG).$(FFMPEG_SUFFIX)
+FFMPEG_SUFFIX	:= tar.xz
+FFMPEG_URL	:= https://www.ffmpeg.org/releases/$(FFMPEG).$(FFMPEG_SUFFIX)
 FFMPEG_SOURCE	:= $(SRCDIR)/$(FFMPEG).$(FFMPEG_SUFFIX)
 FFMPEG_DIR	:= $(BUILDDIR)/$(FFMPEG)
-
+# Note: any GPL only code is disabled below with --disable-gpl
+FFMPEG_LICENSE	:= LGPL-2.1-or-later AND BSD-3-Clause
+FFMPEG_LICENSE_FILES := \
+	file://LICENSE.md;md5=e6c05704638b696e6df04470d7fede29 \
+	file://COPYING.LGPLv2.1;md5=bd7a443320af8c812e4c18d1b79df004 \
+	file://libavcodec/arm/vp8dsp_armv6.S;startline=4;endline=52;md5=24eb31d8cad17de39e517e8d946cdee0 \
+	file://libavcodec/mips/ac3dsp_mips.c;startline=2;endline=27;md5=5f25aa1db1ecf13c29efc63800bf6ae8 \
 
 # ----------------------------------------------------------------------------
 # Prepare
 # ----------------------------------------------------------------------------
 
-FFMPEG_PATH	:= PATH=$(CROSS_PATH)
-FFMPEG_ENV 	:= $(CROSS_ENV)
-
-#
-# autoconf
-# Carefull, ffmpeg has a home grown configure, and not all autoconf options work!!! :-/
-# for example it enables things by default and than only has a --disable-BLA option and no
-# --enable-BLA option.
-#
-FFMPEG_AUTOCONF := --prefix=/usr
-FFMPEG_AUTOCONF += --cross-prefix=$(COMPILER_PREFIX)
-#FFMPEG_AUTOCONF += --cc=$(CROSS_CC)
-#FFMPEG_AUTOCONF += --make=$(MAKE)
-FFMPEG_AUTOCONF += --source-path=$(FFMPEG_DIR)
-#FFMPEG_AUTOCONF += --build-suffix=SUFFIX
-FFMPEG_AUTOCONF += --extra-cflags="$(CROSS_CPPFLAGS) $(CROSS_CFLAGS) -L$(SYSROOT)/usr/lib"
-FFMPEG_AUTOCONF += --extra-ldflags="$(CROSS_LDFLAGS) -L$(SYSROOT)/usr/lib"
-FFMPEG_AUTOCONF += --extra-libs="$(CROSS_LIBS) -lm"
-#FFMPEG_AUTOCONF += --enable-mingw32
-#FFMPEG_AUTOCONF += --enable-mingwce
-#FFMPEG_AUTOCONF += --enable-sunmlib
-#FFMPEG_AUTOCONF += --disable-audio-beos
-
-ifdef PTXCONF_ARCH_X86
- FFMPEG_AUTOCONF += --disable-altivec
- FFMPEG_AUTOCONF += --disable-iwmmxt
- ifdef PTXCONF_ARCH_X86_I386
-  FFMPEG_AUTOCONF += \
-	--arch=x86_32 \
-	--cpu=i386 \
-	--tune=i386 \
-	--disable-mmx
- endif
- ifdef PTXCONF_ARCH_X86_I486
-  FFMPEG_AUTOCONF += \
-	--arch=x86_32 \
-	--cpu=i486 \
-	--tune=i486 \
-	--disable-mmx
- endif
- ifdef PTXCONF_ARCH_X86_I586
-  FFMPEG_AUTOCONF += \
-	--arch=x86_32 \
-	--cpu=i386 \
-	--cpu=i586 \
-	--tune=i586
- endif
- ifdef PTXCONF_ARCH_X86_I686
-  FFMPEG_AUTOCONF += \
-	--arch=x86_32 \
-	--cpu=i386 \
-	--cpu=i686 \
-	--tune=i686
- endif
- ifdef PTXCONF_ARCH_X86_P2
-  FFMPEG_AUTOCONF += \
-	--arch=x86_32 \
-	--cpu=i386 \
-	--cpu=i686 \
-	--tune=pentium2
- endif
- ifdef PTXCONF_ARCH_X86_P3M
-  FFMPEG_AUTOCONF += \
-	--arch=x86_32 \
-	--cpu=i386 \
-	--cpu=i686 \
-	--tune=pentium3
- endif
-endif
-
-ifdef PTXCONF_ARCH_ALPHA
-FFMPEG_AUTOCONF += \
-	--arch=alpha \
-        --cpu=alpha \
-        --disable-altivec \
-        --disable-mmx \
-        --disable-iwmmxt
-endif
-
-ifdef PTXCONF_ARCH_ARM
- ifdef PTXCONF_ARCH_ARM_IWMMXT
-   FFMPEG_AUTOCONF += \
-	--arch=arm \
-	--cpu=iwmmxt \
-	--disable-altivec \
-	--disable-mmx
- else
-# v5 fallback. Will not run on v4.
-   FFMPEG_AUTOCONF += \
-	--arch=arm \
-	--cpu=arm926ej-s \
-	--disable-altivec \
-	--disable-mmx \
-	--disable-iwmmxt
- endif
-endif
-
-ifdef PTXCONF_ARCH_PPC
-FFMPEG_AUTOCONF += \
-	--cpu=powerpc \
-	--disable-altivec \
-	--disable-mmx \
-	--disable-iwmmxt
-# FFMPEG_AUTOCONF += --powerpc-perf-enable
-endif
-
-ifdef PTXCONF_ARCH_M68K
-FFMPEG_AUTOCONF += \
-	--cpu=m68k \
-	--disable-altivec \
-	--disable-mmx \
-	--disable-iwmmxt
-endif
-
-ifdef PTXCONF_ARCH_SPARC
-FFMPEG_AUTOCONF += \
-	--cpu=sparc \
-	--disable-altivec \
-	--disable-mmx \
-	--disable-iwmmxt
-endif
-
-ifdef PTXCONF_ARCH_MIPS
-FFMPEG_AUTOCONF += \
-	--disable-altivec \
-	--disable-mmx \
-	--disable-iwmmxt
-endif
-
-ifdef PTXCONF_ARCH_CRIS
-FFMPEG_AUTOCONF += \
-	--cpu=cris \
-	--disable-altivec \
-	--disable-mmx \
-	--disable-iwmmxt
-endif
-
-ifdef PTXCONF_ARCH_PARISC
-FFMPEG_AUTOCONF += \
-	--cpu=parisc \
-	--disable-altivec \
-	--disable-mmx \
-	--disable-iwmmxt
-endif
-
-ifdef PTXCONF_ARCH_SH
-FFMPEG_AUTOCONF += \
-	--cpu=sh4 \
-	--disable-altivec \
-	--disable-mmx \
-	--disable-iwmmxt
-endif
-
-ifdef PTXCONF_FFMPEG_SHARED
-FFMPEG_AUTOCONF += --enable-shared
-else
-FFMPEG_AUTOCONF += --disable-shared
-endif
-
-ifdef PTXCONF_FFMPEG_STATIC
-FFMPEG_AUTOCONF += --enable-static
-else
-FFMPEG_AUTOCONF += --disable-static
-endif
-
-ifdef PTXCONF_FFMPEG_PTHREADS
-FFMPEG_AUTOCONF += --enable-pthreads
-endif
-
-ifndef PTXCONF_FFMPEG_FFSERVER
-FFMPEG_AUTOCONF += --disable-ffserver
-endif
-
-ifndef PTXCONF_FFMPEG_FFPLAY
-FFMPEG_AUTOCONF += --disable-ffplay
-endif
-
-ifdef PTXCONF_FFMPEG_SMALL
-FFMPEG_AUTOCONF += --enable-small
-endif
-
-ifdef PTXCONF_FFMPEG_MEMALIGN_HACK
-FFMPEG_AUTOCONF += --enable-memalign-hack
-endif
-
-ifndef PTXCONF_FFMPEG_STRIP
-FFMPEG_AUTOCONF += --disable-strip
-endif
-
-ifdef PTXCONF_FFMPEG_GPROF
-FFMPEG_AUTOCONF += --enable-gprof
-endif
-
-ifndef PTXCONF_FFMPEG_DEBUG
-FFMPEG_AUTOCONF += --disable-debug
-endif
-
-ifndef PTXCONF_FFMPEG_OPTS
-FFMPEG_AUTOCONF += --disable-opts
-endif
-
-ifdef PTXCONF_FFMPEG_GPL
-FFMPEG_AUTOCONF += --enable-gpl
-endif
-
-ifdef PTXCONF_FFMPEG_MP3LAME
-FFMPEG_AUTOCONF += --enable-mp3lame
-endif
-
-ifdef PTXCONF_FFMPEG_LIBOGG
-FFMPEG_AUTOCONF += --enable-libogg
-endif
-
-ifdef PTXCONF_FFMPEG_VORBIS
-FFMPEG_AUTOCONF += --enable-vorbis
-endif
-
-ifdef PTXCONF_FFMPEG_THEORA
-FFMPEG_AUTOCONF += --enable-theora
+ifdef PTXCONF_FFMPEG
+FFMPEG_CPU := $(strip $(shell ptxd_cross_cc_v | sed -n "s/COLLECT_GCC_OPTIONS=.*'-march=\([^']*\)'.*/\1/p" | tail -n1))
+ifeq ($(FFMPEG_CPU),)
+FFMPEG_CPU := $(strip $(shell ptxd_cross_cc_v | sed -n "s/COLLECT_GCC_OPTIONS=.*'-mcpu=\([^']*\)'.*/\1/p" | tail -n1))
 endif
-
-ifdef PTXCONF_FFMPEG_FAAD
-FFMPEG_AUTOCONF += --enable-faad
-endif
-
-ifdef PTXCONF_FFMPEG_FAADBIN
-FFMPEG_AUTOCONF += --enable-faadbin
-endif
-
-ifdef PTXCONF_FFMPEG_FAAC
-FFMPEG_AUTOCONF += --enable-faac
-endif
-
-ifdef PTXCONF_FFMPEG_LIBGSM
-FFMPEG_AUTOCONF += --enable-libgsm
-endif
-
-ifdef PTXCONF_FFMPEG_XVID
-FFMPEG_AUTOCONF += --enable-xvid
-endif
-
-ifdef PTXCONF_FFMPEG_X264
-FFMPEG_AUTOCONF += --enable-x264
-endif
-
-ifdef PTXCONF_FFMPEG_A52
-FFMPEG_AUTOCONF += --enable-a52
-endif
-
-ifdef PTXCONF_FFMPEG_A52BIN
-FFMPEG_AUTOCONF += --enable-a52bin
-endif
-
-ifdef PTXCONF_FFMPEG_DTS
-FFMPEG_AUTOCONF += --enable-dts
-endif
-
-ifdef PTXCONF_FFMPEG_PP
-FFMPEG_AUTOCONF += --enable-pp
-endif
-
-ifdef PTXCONF_FFMPEG_AMR_NB
-FFMPEG_AUTOCONF += --enable-amr_nb
-endif
-
-ifdef PTXCONF_FFMPEG_AMR_NB_FIXED
-FFMPEG_AUTOCONF += --enable-amr_nb-fixed
-endif
-
-ifdef PTXCONF_FFMPEG_AMR_WB
-FFMPEG_AUTOCONF += --enable-amr_wb
-endif
-
-ifdef PTXCONF_FFMPEG_AMR_IF2
-FFMPEG_AUTOCONF += --enable-amr_if2
-endif
-
-ifdef PTXCONF_FFMPEG_DC1394
-FFMPEG_AUTOCONF += --enable-dc1394
+ifeq ($(FFMPEG_CPU),)
+FFMPEG_CPU := generic
 endif
-
-ifndef PTXCONF_FFMPEG_AUDIO_OSS
-FFMPEG_AUTOCONF += --disable-audio-oss
-endif
-
-ifndef PTXCONF_FFMPEG_V4L
-FFMPEG_AUTOCONF += --disable-v4l
-endif
-
-ifndef PTXCONF_FFMPEG_V4L2
-FFMPEG_AUTOCONF += --disable-v4l2
-endif
-
-ifndef PTXCONF_FFMPEG_BKTR
-FFMPEG_AUTOCONF += --disable-bktr
-endif
-
-ifndef PTXCONF_FFMPEG_DV1394
-FFMPEG_AUTOCONF += --disable-dv1394
-endif
-
-ifndef PTXCONF_FFMPEG_NETWORK
-FFMPEG_AUTOCONF += --disable-network
-endif
-
-ifndef PTXCONF_FFMPEG_ZLIB
-FFMPEG_AUTOCONF += --disable-zlib
-endif
-
-ifndef PTXCONF_FFMPEG_SIMPLE_IDCT
-FFMPEG_AUTOCONF += --disable-simple_idct
 endif
 
-ifndef PTXCONF_FFMPEG_VHOOK
-FFMPEG_AUTOCONF += --disable-vhook
-endif
-
-ifndef PTXCONF_FFMPEG_MPEGAUDIO_HP
-FFMPEG_AUTOCONF += --disable-mpegaudio-hp
-endif
-
-ifndef PTXCONF_FFMPEG_PROTOCOL
-FFMPEG_AUTOCONF += --disable-protocols
-endif
-
-# FIXME selectivly enable/disable decoders to reduce library size
-
-#--disable-encoder=NAME   disables encoder NAME
-#--enable-encoder=NAME    enables encoder NAME
-#--disable-decoder=NAME   disables decoder NAME
-#--enable-decoder=NAME    enables decoder NAME
-#--disable-encoders       disables all encoders
-#--disable-decoders       disables all decoders
-#--disable-muxers         disables all muxers
-#--disable-demuxers       disables all demuxers
+#
+# autoconf
+#
+FFMPEG_CONF_TOOL	:= autoconf
+FFMPEG_CONF_OPT		:= \
+	--prefix=/usr \
+	--libdir=/usr/$(CROSS_LIB_DIR) \
+	--disable-rpath \
+	--disable-gpl \
+	--disable-version3 \
+	--disable-nonfree \
+	--disable-static \
+	--enable-shared \
+	--disable-small \
+	--enable-runtime-cpudetect \
+	--disable-gray \
+	--enable-swscale-alpha \
+	\
+	--disable-autodetect \
+	--disable-programs \
+	--disable-ffmpeg \
+	--disable-ffplay \
+	--disable-ffprobe \
+	--disable-doc \
+	--disable-htmlpages \
+	--disable-manpages \
+	--disable-podpages \
+	--disable-txtpages \
+	\
+	--disable-avdevice \
+	--enable-avcodec \
+	--enable-avformat \
+	--enable-swresample \
+	--disable-swscale \
+	--disable-postproc \
+	--enable-avfilter \
+	--disable-avresample \
+	\
+	--enable-pthreads \
+	--disable-network \
+	--enable-dct \
+	--enable-dwt \
+	--enable-error-resilience \
+	--enable-lsp \
+	--enable-lzo \
+	--enable-mdct \
+	--enable-rdft \
+	--enable-fft \
+	--enable-faan \
+	--enable-pixelutils \
+	\
+	--enable-encoders \
+	--enable-decoders \
+	--disable-hwaccels \
+	--enable-muxers \
+	--enable-demuxers \
+	--enable-parsers \
+	--enable-bsfs \
+	--disable-protocols \
+	--disable-indevs \
+	--disable-outdevs \
+	--disable-devices \
+	--disable-filters \
+	\
+	--disable-alsa \
+	--disable-appkit \
+	--disable-avfoundation \
+	--disable-avisynth \
+	--disable-bzlib \
+	--disable-coreimage \
+	--disable-chromaprint \
+	--disable-frei0r \
+	--disable-gcrypt \
+	--disable-gmp \
+	--disable-gnutls \
+	--disable-iconv \
+	--disable-jni \
+	--disable-ladspa \
+	--disable-libaom \
+	--disable-libass \
+	--disable-libbluray \
+	--disable-libbs2b \
+	--disable-libcaca \
+	--disable-libcelt \
+	--disable-libcdio \
+	--disable-libcodec2 \
+	--disable-libdavs2 \
+	--disable-libdc1394 \
+	--disable-libfdk-aac \
+	--disable-libflite \
+	--disable-libfontconfig \
+	--disable-libfreetype \
+	--disable-libfribidi \
+	--disable-libgme \
+	--disable-libgsm \
+	--disable-libiec61883 \
+	--disable-libilbc \
+	--disable-libjack \
+	--disable-libklvanc \
+	--disable-libkvazaar \
+	--disable-liblensfun \
+	--disable-libmodplug \
+	--disable-libmp3lame \
+	--disable-libopencore-amrnb \
+	--disable-libopencore-amrwb \
+	--disable-libopencv \
+	--disable-libopenh264 \
+	--disable-libopenjpeg \
+	--disable-libopenmpt \
+	--disable-libopus \
+	--disable-libpulse \
+	--disable-librsvg \
+	--disable-librubberband \
+	--disable-librtmp \
+	--disable-libshine \
+	--disable-libsmbclient \
+	--disable-libsnappy \
+	--disable-libsoxr \
+	--disable-libspeex \
+	--disable-libsrt \
+	--disable-libssh \
+	--disable-libtensorflow \
+	--disable-libtesseract \
+	--disable-libtheora \
+	--disable-libtls \
+	--disable-libtwolame \
+	--disable-libv4l2 \
+	--disable-libvidstab \
+	--disable-libvmaf \
+	--disable-libvo-amrwbenc \
+	--disable-libvorbis \
+	--disable-libvpx \
+	--disable-libwavpack \
+	--disable-libwebp \
+	--disable-libx264 \
+	--disable-libx265 \
+	--disable-libxavs \
+	--disable-libxavs2 \
+	--disable-libxcb \
+	--disable-libxcb-shm \
+	--disable-libxcb-xfixes \
+	--disable-libxcb-shape \
+	--disable-libxvid \
+	--disable-libxml2 \
+	--disable-libzimg \
+	--disable-libzmq \
+	--disable-libzvbi \
+	--disable-lv2 \
+	--disable-lzma \
+	--disable-decklink \
+	--disable-libndi_newtek \
+	--disable-mbedtls \
+	--disable-mediacodec \
+	--disable-libmysofa \
+	--disable-openal \
+	--disable-opencl \
+	--disable-opengl \
+	--disable-openssl \
+	--disable-sndio \
+	--disable-schannel \
+	--disable-sdl2 \
+	--disable-securetransport \
+	--disable-vapoursynth \
+	--disable-xlib \
+	--disable-zlib \
+	--disable-amf \
+	--disable-audiotoolbox \
+	--disable-cuda-sdk \
+	--disable-cuvid \
+	--disable-d3d11va \
+	--disable-dxva2 \
+	--disable-ffnvcodec \
+	--disable-libdrm \
+	--disable-libmfx \
+	--disable-libnpp \
+	--disable-mmal \
+	--disable-nvdec \
+	--disable-nvenc \
+	--disable-omx \
+	--disable-omx-rpi \
+	--disable-rkmpp \
+	--disable-v4l2_m2m \
+	--disable-vaapi \
+	--disable-vdpau \
+	--disable-videotoolbox \
+	\
+	--arch=$(PTXCONF_ARCH_STRING) \
+	--cpu=$(FFMPEG_CPU) \
+	--cross-prefix=$(PTXCONF_COMPILER_PREFIX) \
+	--enable-cross-compile \
+	--target-os=linux \
+	--target-exec=false \
+	--doxygen=false \
+	--enable-pic \
+	--disable-lto \
+	\
+	--enable-optimizations \
+	--disable-stripping
 
 # ----------------------------------------------------------------------------
 # Target-Install
@@ -376,46 +254,14 @@ $(STATEDIR)/ffmpeg.targetinstall:
 	@$(call install_init, ffmpeg)
 	@$(call install_fixup, ffmpeg,PRIORITY,optional)
 	@$(call install_fixup, ffmpeg,SECTION,base)
-	@$(call install_fixup, ffmpeg,AUTHOR,"Erwin Rol <ero@pengutronix.de>")
+	@$(call install_fixup, ffmpeg,AUTHOR,"Michael Olbrich <m.olbrich@pengutronix.de>")
 	@$(call install_fixup, ffmpeg,DESCRIPTION,missing)
 
-	@$(call install_copy, ffmpeg, 0, 0, 0644, -, \
-		/usr/lib/libavcodec.so, n)
-	@$(call install_link, ffmpeg, \
-		libavcodec.so, \
-		/usr/lib/libavcodec.so.51)
-	@$(call install_link, ffmpeg, \
-		libavcodec.so, \
-		/usr/lib/libavcodec.so.51.7.0)
-
-	@$(call install_copy, ffmpeg, 0, 0, 0644, -, \
-		/usr/lib/libavformat.so, n)
-	@$(call install_link, ffmpeg, \
-		libavformat.so, \
-		/usr/lib/libavformat.so.50)
-	@$(call install_link, ffmpeg, \
-		libavformat.so, \
-		/usr/lib/libavformat.so.50.3.0)
-
-	@$(call install_copy, ffmpeg, 0, 0, 0644, -, \
-		/usr/lib/libavutil.so, n)
-	@$(call install_link, ffmpeg, \
-		libavutil.so, \
-		/usr/lib/libavutil.so.49)
-	@$(call install_link, ffmpeg, \
-		libavcodec.so, \
-		/usr/lib/libavutil.so.49.0.0)
-
-ifdef PTXCONF_FFMPEG_PP
-	@$(call install_copy, ffmpeg, 0, 0, 0644, -, \
-		/usr/lib/libpostproc.so, n)
-	@$(call install_link, ffmpeg, \
-		libpostproc.so, \
-		/usr/lib/libpostproc.so.51)
-	@$(call install_link, ffmpeg, \
-		libpostproc.so, \
-		/usr/lib/libpostproc.so.51.0.0)
-endif
+	@$(call install_lib, ffmpeg, 0, 0, 0644, libavcodec)
+	@$(call install_lib, ffmpeg, 0, 0, 0644, libavfilter)
+	@$(call install_lib, ffmpeg, 0, 0, 0644, libavformat)
+	@$(call install_lib, ffmpeg, 0, 0, 0644, libavutil)
+	@$(call install_lib, ffmpeg, 0, 0, 0644, libswresample)
 
 	@$(call install_finish, ffmpeg)