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>

1 files changed, 7 insertions, 307 deletions

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