[package] ffmpeg: 0.8.2 Version Bump (#8831)

[packages.git] / multimedia / ffmpeg / Config.in

diff --git a/multimedia/ffmpeg/Config.in b/multimedia/ffmpeg/Config.in
index 32665d8..69950b1 100644 (file)
--- a/multimedia/ffmpeg/Config.in
+++ b/multimedia/ffmpeg/Config.in
@@ -1,9 +1,13 @@
 menu "Configuration"
        depends PACKAGE_libffmpeg
 
-config FFMPEG_IPV6
-       bool "Enable IPv6"
-       default IPV6
+config FFMPEG_ENCODE
+       bool "Big Toggle for FFmpeg's encoder/muxer support"
+       depends FFMPEG_PATENTED
+
+config FFMPEG_DECODE
+       bool "Big Toggle for FFmpeg's decoder/demuxer support"
+       depends FFMPEG_PATENTED
 
 config FFMPEG_PATENTED
        bool "Include patented codecs and technologies"
@@ -27,7 +31,6 @@ config FFMPEG_LIBDLNA_SUPPORT
        select FFMPEG_DECODER_mpeg1video
        select FFMPEG_DECODER_mpeg2video
        select FFMPEG_DECODER_mpeg4
-       select FFMPEG_DECODER_mpeg4aac
        select FFMPEG_DECODER_mpegvideo
        select FFMPEG_DECODER_wmav1
        select FFMPEG_DECODER_wmav2
@@ -49,7 +52,6 @@ config FFMPEG_MINIDLNA_SUPPORT
        select FFMPEG_DECODER_mpeg1video
        select FFMPEG_DECODER_mpeg2video
        select FFMPEG_DECODER_mpeg4
-       select FFMPEG_DECODER_mpeg4aac
        select FFMPEG_DECODER_mpegvideo
        select FFMPEG_DECODER_wmav1
        select FFMPEG_DECODER_wmav2
@@ -153,10 +155,6 @@ config FFMPEG_DECODER_mpeg4
        bool "MPEG-4"
        depends FFMPEG_PATENTED
 
-config FFMPEG_DECODER_mpeg4aac
-       bool "MPEG-4 (AAC)"
-       depends FFMPEG_PATENTED
-
 config FFMPEG_DECODER_pcm_s16be
        bool "PCM signed 16-bit big-endian"
 
@@ -212,9 +210,6 @@ config FFMPEG_MUXER_mpegts
 config FFMPEG_MUXER_ogg
        bool "Ogg"
 
-config FFMPEG_MUXER_oss
-       bool "OSS (Open Sound System playback)"
-
 config FFMPEG_MUXER_rtp
        bool "RTP"
 
@@ -322,4 +317,3 @@ config FFMPEG_PROTOCOL_udp
        bool "udp:"
 
 endmenu
-