Commit 5253efad authored by Luca Ceresoli's avatar Luca Ceresoli Committed by Peter Korsgaard
Browse files

ffmpeg: add commandline programs 



Signed-off-by: default avatarLuca Ceresoli <luca@lucaceresoli.net>
Signed-off-by: default avatarPeter Korsgaard <jacmet@sunsite.dk>
parent 13293407

package/multimedia/ffmpeg/Config.in

+23 −0
Original line number Diff line number Diff line
@@ -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

package/multimedia/ffmpeg/ffmpeg-0.5.2-fix-sdl-config-search.patch

0 → 100644
+17 −0
Original line number Diff line number Diff line 
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

package/multimedia/ffmpeg/ffmpeg.mk

+20 −3
Original line number Diff line number Diff line
@@ -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