Skip to contentSkip to conversation

ffmpeg: fix dependencies

PATCH New Benoît Thébaudeau 2 participants 2 messages Jun 12, 2015

lore
Share & tools
lore

Benoît Thébaudeau

author
#0 lore raw

PATCH 1/1 ffmpeg: fix dependencies

The ffmpeg binary does not require swscale, but ffplay needs it.

ffserver needs fork().

Signed-off-by Beno?t Th?baudeau <[email protected]>
---
 package/ffmpeg/Config.in | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
package/ffmpeg/Config.in +2 -1
index 00163ba..e5981fe 100644
@@ -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.
Signature · 1 line
2.1.4
Applied
#1 lore raw

PATCH 1/1 ffmpeg: fix dependencies

Dear Beno?t Th?baudeau,

Quoted 8 lines · Beno?t Th?baudeau

The ffmpeg binary does not require swscale, but ffplay needs it.

ffserver needs fork().

Signed-off-by Beno?t Th?baudeau <[email protected]>
---
 package/ffmpeg/Config.in | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

Applied, thanks.

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com