summaryrefslogtreecommitdiffstats
path: root/package/ffmpeg/ffmpeg.mk
diff options
context:
space:
mode:
authorPhil Eichinger <phil.eichinger@gmail.com>2016-12-06 15:32:37 +0100
committerPeter Korsgaard <peter@korsgaard.com>2016-12-06 19:56:40 +0100
commitd767ff85f2bf9b5e1fbcbad22f0cab6a6a606e6c (patch)
tree7588c1cee717b18f47f11ffe08f209d809413e9f /package/ffmpeg/ffmpeg.mk
parent9dd5b1aafbf1f52a3cfe7ecb7804c3280b61ad11 (diff)
downloadbuildroot-d767ff85f2bf9b5e1fbcbad22f0cab6a6a606e6c.tar.gz
buildroot-d767ff85f2bf9b5e1fbcbad22f0cab6a6a606e6c.zip
ffmpeg: fix build for ffplay
Upstream has dropped SDL support for ffplay in favor of SDL2. This results in silently not building ffplay even if it is selected in Buildroot config. [Peter: propagate !static dependency from sdl2] Signed-off-by: Phil Eichinger <phil@zankapfel.net> Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
Diffstat (limited to 'package/ffmpeg/ffmpeg.mk')
-rw-r--r--package/ffmpeg/ffmpeg.mk4
1 files changed, 2 insertions, 2 deletions
diff --git a/package/ffmpeg/ffmpeg.mk b/package/ffmpeg/ffmpeg.mk
index 699de2ac8f..a681192424 100644
--- a/package/ffmpeg/ffmpeg.mk
+++ b/package/ffmpeg/ffmpeg.mk
@@ -80,9 +80,9 @@ FFMPEG_CONF_OPTS += --disable-ffmpeg
endif
ifeq ($(BR2_PACKAGE_FFMPEG_FFPLAY),y)
-FFMPEG_DEPENDENCIES += sdl
+FFMPEG_DEPENDENCIES += sdl2
FFMPEG_CONF_OPTS += --enable-ffplay
-FFMPEG_CONF_ENV += SDL_CONFIG=$(STAGING_DIR)/usr/bin/sdl-config
+FFMPEG_CONF_ENV += SDL_CONFIG=$(STAGING_DIR)/usr/bin/sdl2-config
else
FFMPEG_CONF_OPTS += --disable-ffplay
endif
OpenPOWER on IntegriCloud