diff mbox

ffmpeg: fix dependencies

Message ID 1434106383-60787-1-git-send-email-benoit@wsystem.com
State Accepted
Headers show

Commit Message

Benoît Thébaudeau June 12, 2015, 10:53 a.m. UTC
The ffmpeg binary does not require swscale, but ffplay needs it.

ffserver needs fork().

Signed-off-by: Benoît Thébaudeau <benoit@wsystem.com>
---
 package/ffmpeg/Config.in | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

Comments

Thomas Petazzoni June 12, 2015, 7:28 p.m. UTC | #1
Dear Benoît Thébaudeau,

On Fri, 12 Jun 2015 12:53:03 +0200, Benoît Thébaudeau wrote:
> The ffmpeg binary does not require swscale, but ffplay needs it.
> 
> ffserver needs fork().
> 
> Signed-off-by: Benoît Thébaudeau <benoit@wsystem.com>
> ---
>  package/ffmpeg/Config.in | 3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)

Applied, thanks.

Thomas
diff mbox

Patch

diff --git a/package/ffmpeg/Config.in b/package/ffmpeg/Config.in
index 00163ba..e5981fe 100644
--- a/package/ffmpeg/Config.in
+++ b/package/ffmpeg/Config.in
@@ -25,7 +25,6 @@  config BR2_PACKAGE_FFMPEG_NONFREE
 
 config BR2_PACKAGE_FFMPEG_FFMPEG
 	bool "Build ffmpeg (the command line application)"
-	select BR2_PACKAGE_FFMPEG_SWSCALE
 	default y
 	help
 	  FFmpeg is a very fast video and audio converter.
@@ -36,6 +35,7 @@  config BR2_PACKAGE_FFMPEG_FFMPEG
 
 config BR2_PACKAGE_FFMPEG_FFPLAY
 	bool "Build ffplay"
+	select BR2_PACKAGE_FFMPEG_SWSCALE
 	select BR2_PACKAGE_SDL
 	help
 	  FFplay is a very simple and portable media player using the
@@ -44,6 +44,7 @@  config BR2_PACKAGE_FFMPEG_FFPLAY
 
 config BR2_PACKAGE_FFMPEG_FFSERVER
 	bool "Build ffserver"
+	depends on BR2_USE_MMU # fork()
 	help
 	  FFserver is a streaming server for both audio and video.