LILiK
/
openwrt-packages-dist
5
0
Fork 0
Code Issues 0 Pull Requests 0 Projects 0 Releases 0 Wiki Activity
Browse Source

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>
lilik-openwrt-22.03
Ian Leonard 10 years ago
parent
2b414271f5
commit
8bbe2c06fa
2 changed files with 8 additions and 16 deletions
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. +7
    -1
      multimedia/ffmpeg/Config.in
  2. +1
    -15
      multimedia/ffmpeg/Makefile

+ 7
- 1
multimedia/ffmpeg/Config.in View File

@ -27,9 +27,9 @@ config FFMPEG_CUSTOM_MINIDLNA_SUPPORT
select FFMPEG_CUSTOM_DECODER_mpeg2video select FFMPEG_CUSTOM_DECODER_mpeg2video
select FFMPEG_CUSTOM_DECODER_mpeg4 select FFMPEG_CUSTOM_DECODER_mpeg4
select FFMPEG_CUSTOM_DECODER_mpegvideo select FFMPEG_CUSTOM_DECODER_mpegvideo
select FFMPEG_CUSTOM_DECODER_png
select FFMPEG_CUSTOM_DECODER_wmav1 select FFMPEG_CUSTOM_DECODER_wmav1
select FFMPEG_CUSTOM_DECODER_wmav2 select FFMPEG_CUSTOM_DECODER_wmav2
select FFMPEG_CUSTOM_DECODER_png
select FFMPEG_CUSTOM_DEMUXER_aac select FFMPEG_CUSTOM_DEMUXER_aac
select FFMPEG_CUSTOM_DEMUXER_ac3 select FFMPEG_CUSTOM_DEMUXER_ac3
select FFMPEG_CUSTOM_DEMUXER_avi select FFMPEG_CUSTOM_DEMUXER_avi
@ -38,7 +38,13 @@ config FFMPEG_CUSTOM_MINIDLNA_SUPPORT
select FFMPEG_CUSTOM_DEMUXER_matroska select FFMPEG_CUSTOM_DEMUXER_matroska
select FFMPEG_CUSTOM_DEMUXER_mov select FFMPEG_CUSTOM_DEMUXER_mov
select FFMPEG_CUSTOM_DEMUXER_mp3 select FFMPEG_CUSTOM_DEMUXER_mp3
select FFMPEG_CUSTOM_DEMUXER_mpegts
select FFMPEG_CUSTOM_DEMUXER_mpegvideo 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 select FFMPEG_CUSTOM_PROTOCOL_file
config FFMPEG_CUSTOM_AUDIO_DEC_SUPPORT config FFMPEG_CUSTOM_AUDIO_DEC_SUPPORT


+ 1
- 15
multimedia/ffmpeg/Makefile View File

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


Write Preview
Loading…
Cancel
Save