ffmpeg: improve minidlna profile

Minidlna has no need to mux streams, or be able to read network streams at this point in time, so remove this support from
libffmpeg.

Synchronize the minidlna profile between libffmpeg-ucstom and libffmpeg-mini.

Signed-off-by: Ian Leonard <antonlacon@gmail.com>

diff --git a/multimedia/ffmpeg/Config.in b/multimedia/ffmpeg/Config.in
index 5e19e4c121d6a7fd899745080765e237286b4230..3e6e2091d2974c7698f2d234f2f4007cf1235de4 100644 (file)
--- a/multimedia/ffmpeg/Config.in
+++ b/multimedia/ffmpeg/Config.in
@@ -27,9 +27,9 @@ config FFMPEG_CUSTOM_MINIDLNA_SUPPORT
        select FFMPEG_CUSTOM_DECODER_mpeg2video
        select FFMPEG_CUSTOM_DECODER_mpeg4
        select FFMPEG_CUSTOM_DECODER_mpegvideo
+       select FFMPEG_CUSTOM_DECODER_png
        select FFMPEG_CUSTOM_DECODER_wmav1
        select FFMPEG_CUSTOM_DECODER_wmav2
-       select FFMPEG_CUSTOM_DECODER_png
        select FFMPEG_CUSTOM_DEMUXER_aac
        select FFMPEG_CUSTOM_DEMUXER_ac3
        select FFMPEG_CUSTOM_DEMUXER_avi
@@ -38,7 +38,13 @@ config FFMPEG_CUSTOM_MINIDLNA_SUPPORT
        select FFMPEG_CUSTOM_DEMUXER_matroska
        select FFMPEG_CUSTOM_DEMUXER_mov
        select FFMPEG_CUSTOM_DEMUXER_mp3
+       select FFMPEG_CUSTOM_DEMUXER_mpegts
        select FFMPEG_CUSTOM_DEMUXER_mpegvideo
+       select FFMPEG_CUSTOM_PARSER_ac3
+       select FFMPEG_CUSTOM_PARSER_flac
+       select FFMPEG_CUSTOM_PARSER_h264
+       select FFMPEG_CUSTOM_PARSER_mpeg4video
+       select FFMPEG_CUSTOM_PARSER_mpegaudio
        select FFMPEG_CUSTOM_PROTOCOL_file
 
 config FFMPEG_CUSTOM_AUDIO_DEC_SUPPORT

diff --git a/multimedia/ffmpeg/Makefile b/multimedia/ffmpeg/Makefile
index 6ab79f524f8cb4274b447fa97dc51d70da1467a5..71680141d5cb2f655a335e915768a589107d5389 100644 (file)
--- a/multimedia/ffmpeg/Makefile
+++ b/multimedia/ffmpeg/Makefile
@@ -110,14 +110,10 @@ FFMPEG_CUSTOM_PARSERS:= \
 FFMPEG_CUSTOM_PROTOCOLS:= \
        file http pipe rtp tcp udp
 
-FFMPEG_MINI_ENCODERS:= \
-
 FFMPEG_MINI_DECODERS:= \
        aac \
        ac3 \
-       atrac3 \
        flac \
-       h263 \
        h264 \
        jpegls \
        mp3 \
@@ -129,15 +125,10 @@ FFMPEG_MINI_DECODERS:= \
        wmav1 \
        wmav2 \
 
-FFMPEG_MINI_MUXERS:= \
-       ffm \
-
 FFMPEG_MINI_DEMUXERS := \
        aac \
        ac3 \
-       asf \
        avi \
-       ffm \
        flac \
        h264 \
        matroska \
@@ -145,19 +136,16 @@ FFMPEG_MINI_DEMUXERS := \
        mp3 \
        mpegts \
        mpegvideo \
-       sdp \
-       rtsp \
 
 FFMPEG_MINI_PARSERS:= \
        ac3 \
        flac \
-       h263 \
        h264 \
        mpeg4video \
        mpegaudio \
 
 FFMPEG_MINI_PROTOCOLS := \
-       file http rtp tcp udp \
+       file \
 
 FFMPEG_AUDIO_DECODERS:= \
        aac \
@@ -486,9 +474,7 @@ ifeq ($(BUILD_VARIANT),mini)
        --disable-swresample \
        --disable-swscale \
        --disable-everything \
-       $(call FFMPEG_ENABLE,encoder,$(FFMPEG_MINI_ENCODERS)) \
        $(call FFMPEG_ENABLE,decoder,$(FFMPEG_MINI_DECODERS)) \
-       $(call FFMPEG_ENABLE,muxer,$(FFMPEG_MINI_MUXERS)) \
        $(call FFMPEG_ENABLE,demuxer,$(FFMPEG_MINI_DEMUXERS)) \
        $(call FFMPEG_ENABLE,parser,$(FFMPEG_MINI_PARSERS)) \
        $(call FFMPEG_ENABLE,protocol,$(FFMPEG_MINI_PROTOCOLS)) \