summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--package/multimedia/gst-ffmpeg/Config.in6
-rw-r--r--package/multimedia/gst-ffmpeg/gst-ffmpeg.mk5
2 files changed, 6 insertions, 5 deletions
diff --git a/package/multimedia/gst-ffmpeg/Config.in b/package/multimedia/gst-ffmpeg/Config.in
index 17873f051..537101e69 100644
--- a/package/multimedia/gst-ffmpeg/Config.in
+++ b/package/multimedia/gst-ffmpeg/Config.in
@@ -2,16 +2,16 @@ config BR2_PACKAGE_GST_FFMPEG
bool "gst-ffmpeg"
depends on BR2_PACKAGE_GSTREAMER
select BR2_PACKAGE_GST_PLUGINS_BASE
- select BR2_PACKAGE_LIBOIL
select BR2_PACKAGE_FFMPEG
select BR2_PACKAGE_FFMPEG_GPL
select BR2_PACKAGE_FFMPEG_POSTPROC
select BR2_PACKAGE_FFMPEG_SWSCALE
depends on BR2_LARGEFILE
+ depends on BR2_INET_IPV6
help
GStreamer plugin using FFmpeg.
http://gstreamer.freedesktop.org/
-comment "gst-ffmpeg requires a toolchain with LARGEFILE support"
- depends on !BR2_LARGEFILE
+comment "gst-ffmpeg requires a toolchain with LARGEFILE and IPV6 support"
+ depends on !(BR2_LARGEFILE && BR2_INET_IPV6)
diff --git a/package/multimedia/gst-ffmpeg/gst-ffmpeg.mk b/package/multimedia/gst-ffmpeg/gst-ffmpeg.mk
index 6e91ad597..ebe87dcb7 100644
--- a/package/multimedia/gst-ffmpeg/gst-ffmpeg.mk
+++ b/package/multimedia/gst-ffmpeg/gst-ffmpeg.mk
@@ -3,11 +3,12 @@
# gst-ffmpeg
#
#############################################################
-GST_FFMPEG_VERSION = 0.10.9
+
+GST_FFMPEG_VERSION = 0.10.11
GST_FFMPEG_SOURCE = gst-ffmpeg-$(GST_FFMPEG_VERSION).tar.bz2
GST_FFMPEG_SITE = http://gstreamer.freedesktop.org/src/gst-ffmpeg
GST_FFMPEG_INSTALL_STAGING = YES
-GST_FFMPEG_DEPENDENCIES = gstreamer gst-plugins-base ffmpeg liboil
+GST_FFMPEG_DEPENDENCIES = gstreamer gst-plugins-base ffmpeg
GST_FFMPEG_CONF_OPT = --with-system-ffmpeg
ifeq ($(BR2_PACKAGE_BZIP2),y)