diff options
| author | Luca Ceresoli <luca@lucaceresoli.net> | 2010-06-14 21:41:43 +0200 |
|---|---|---|
| committer | Peter Korsgaard <jacmet@sunsite.dk> | 2010-06-14 23:39:15 +0200 |
| commit | 5253efadb0f5ba7e3bc3c339a1fa2a83df86ac7e (patch) | |
| tree | f93d7c71df04ab836691a98247324b434835f7d2 /package/multimedia | |
| parent | 13293407c988c5c5fdcf0ffacf4e29f8462e2b64 (diff) | |
ffmpeg: add commandline programs
Signed-off-by: Luca Ceresoli <luca@lucaceresoli.net>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
Diffstat (limited to 'package/multimedia')
| -rw-r--r-- | package/multimedia/ffmpeg/Config.in | 23 | ||||
| -rw-r--r-- | package/multimedia/ffmpeg/ffmpeg-0.5.2-fix-sdl-config-search.patch | 17 | ||||
| -rw-r--r-- | package/multimedia/ffmpeg/ffmpeg.mk | 23 |
3 files changed, 60 insertions, 3 deletions
diff --git a/package/multimedia/ffmpeg/Config.in b/package/multimedia/ffmpeg/Config.in index f60790a73..16bb32d4f 100644 --- a/package/multimedia/ffmpeg/Config.in +++ b/package/multimedia/ffmpeg/Config.in @@ -24,4 +24,27 @@ config BR2_PACKAGE_FFMPEG_NONFREE allow use of nonfree code, the resulting libs and binaries will be unredistributable +config BR2_PACKAGE_FFMPEG_FFMPEG + bool "Build ffmpeg (the command line application)" + default y + help + FFmpeg is a very fast video and audio converter. + It can also grab from a live audio/video source. + + It is not needed if you want to link the FFmpeg libraries + to your application. + +config BR2_PACKAGE_FFMPEG_FFPLAY + bool "Build ffplay" + select BR2_PACKAGE_SDL + 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 BR2_PACKAGE_FFMPEG_FFSERVER + bool "Build ffserver" + help + FFserver is a streaming server for both audio and video. + endif diff --git a/package/multimedia/ffmpeg/ffmpeg-0.5.2-fix-sdl-config-search.patch b/package/multimedia/ffmpeg/ffmpeg-0.5.2-fix-sdl-config-search.patch new file mode 100644 index 000000000..58d08aa28 --- /dev/null +++ b/package/multimedia/ffmpeg/ffmpeg-0.5.2-fix-sdl-config-search.patch @@ -0,0 +1,17 @@ +Allow FFmpeg's ./configure script to use a custom sdl-config command. + +Inspired from: +http://www.mail-archive.com/uclinux-dist-commits@blackfin.uclinux.org/msg01099.html + +diff -u ffmpeg-0.5.2-orig/configure ffmpeg-0.5.2/configure +--- a/configure ++++ b/configure +@@ -2066,7 +2066,7 @@ + + disable sdl_too_old + disable sdl +-SDL_CONFIG="${cross_prefix}sdl-config" ++SDL_CONFIG="${SDL_CONFIG-${cross_prefix}sdl-config}" + if "${SDL_CONFIG}" --version > /dev/null 2>&1; then + sdl_cflags=`"${SDL_CONFIG}" --cflags` + temp_cflags $sdl_cflags diff --git a/package/multimedia/ffmpeg/ffmpeg.mk b/package/multimedia/ffmpeg/ffmpeg.mk index 618a3c40c..1f9f47295 100644 --- a/package/multimedia/ffmpeg/ffmpeg.mk +++ b/package/multimedia/ffmpeg/ffmpeg.mk @@ -12,9 +12,6 @@ FFMPEG_INSTALL_TARGET = YES FFMPEG_CONF_OPT = \ --prefix=/usr \ --enable-shared \ - --disable-ffmpeg \ - --disable-ffplay \ - --disable-ffserver \ --disable-avfilter \ --disable-postproc \ --disable-swscale \ @@ -32,6 +29,26 @@ else FFMPEG_CONF_OPT += --disable-nonfree endif +ifeq ($(BR2_PACKAGE_FFMPEG_FFMPEG),y) +FFMPEG_CONF_OPT += --enable-ffmpeg +else +FFMPEG_CONF_OPT += --disable-ffmpeg +endif + +ifeq ($(BR2_PACKAGE_FFMPEG_FFPLAY),y) +FFMPEG_DEPENDENCIES += sdl +FFMPEG_CONF_OPT += --enable-ffplay +FFMPEG_CONF_ENV += SDL_CONFIG=$(STAGING_DIR)/usr/bin/sdl-config +else +FFMPEG_CONF_OPT += --disable-ffplay +endif + +ifeq ($(BR2_PACKAGE_FFMPEG_FFSERVER),y) +FFMPEG_CONF_OPT += --enable-ffserver +else +FFMPEG_CONF_OPT += --disable-ffserver +endif + ifeq ($(BR2_PTHREADS_NONE),y) FFMPEG_CONF_OPT += --disable-pthreads else |