From 60d3e89513104a3bec0634737fc11fad88802626 Mon Sep 17 00:00:00 2001 From: florian Date: Sun, 3 Apr 2011 18:29:41 +0000 Subject: [PATCH] [package] minidlna/ffmpeg: add minidlna profile to ffmpeg This adds a profile to ffmpeg to support minidlna, similar to the libdlna/ushare profile. When minidlna encounters media, it uses ffmpeg to figure out what it is. If ffmpeg fails to open it, then minidlna will try and fail to read the file on its own. The profile may need to be extended; I attempted to cover all popular formats for dlna streaming. Tested with the following container/codec combinations: mkv with ac3/h264/srt mp4 with aac/h264/ttxt ogg vorbis flac mp3 Should also be able to handle, but untested: mpeg avi xvid jpeg png wmv1 wmv2 Signed-off-by: Ian Leonard git-svn-id: svn://svn.openwrt.org/openwrt/packages@26450 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- multimedia/ffmpeg/Config.in | 28 ++++++++++++++++++++++++++++ multimedia/minidlna/Makefile | 4 ++-- 2 files changed, 30 insertions(+), 2 deletions(-) diff --git a/multimedia/ffmpeg/Config.in b/multimedia/ffmpeg/Config.in index 326ef7caa..32665d884 100644 --- a/multimedia/ffmpeg/Config.in +++ b/multimedia/ffmpeg/Config.in @@ -37,6 +37,34 @@ config FFMPEG_LIBDLNA_SUPPORT select FFMPEG_DEMUXER_mp3 select FFMPEG_DEMUXER_mpegvideo +config FFMPEG_MINIDLNA_SUPPORT + bool "Include support for minidlna" + depends FFMPEG_PATENTED + select FFMPEG_DECODER_aac + select FFMPEG_DECODER_ac3 + select FFMPEG_DECODER_flac + select FFMPEG_DECODER_h264 + select FFMPEG_DECODER_jpegls + select FFMPEG_DECODER_mp3 + 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 + select FFMPEG_DECODER_png + select FFMPEG_DEMUXER_aac + select FFMPEG_DEMUXER_ac3 + select FFMPEG_DEMUXER_avi + select FFMPEG_DEMUXER_flac + select FFMPEG_DEMUXER_h264 + select FFMPEG_DEMUXER_matroska + select FFMPEG_DEMUXER_mov + select FFMPEG_DEMUXER_mp3 + select FFMPEG_DEMUXER_mpegvideo + select FFMPEG_PROTOCOL_file + comment "Encoders ---" config FFMPEG_ENCODER_ac3 diff --git a/multimedia/minidlna/Makefile b/multimedia/minidlna/Makefile index 772d7e2d8..e28f431d6 100644 --- a/multimedia/minidlna/Makefile +++ b/multimedia/minidlna/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=minidlna PKG_VERSION:=1.0.18 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_SOURCE:=$(PKG_NAME)_$(PKG_VERSION)_src.tar.gz PKG_SOURCE_URL:=@SF/minidlna @@ -31,7 +31,7 @@ define Package/minidlna TITLE:=UPnP A/V & DLNA Media Server URL:=http://minidlna.sourceforge.net/ DEPENDS:= +libpthread +libexif +libjpeg +libsqlite3 +libffmpeg \ - +libid3tag +libflac +libvorbis +libuuid \ + +@FFMPEG_MINIDLNA_SUPPORT +libid3tag +libflac +libvorbis +libuuid \ $(ICONV_DEPENDS) $(INTL_DEPENDS) endef -- 2.11.0