summaryrefslogtreecommitdiff
path: root/package/ffmpeg
diff options
context:
space:
mode:
authorBernd Kuhls <bernd.kuhls@t-online.de>2015-11-01 19:47:29 +0100
committerThomas Petazzoni <thomas.petazzoni@free-electrons.com>2015-11-02 16:15:08 +0100
commitd6a69587a9a1bb61e4b61280e3f1cad4a7fee110 (patch)
tree920cdbe5adbd52b44a5804c03423246075a75a01 /package/ffmpeg
parent9eca4b9f84fe2535d8caee6eeb062ce33733bdf1 (diff)
package/ffmpeg: Add support for x265
Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Diffstat (limited to 'package/ffmpeg')
-rw-r--r--package/ffmpeg/ffmpeg.mk7
1 files changed, 7 insertions, 0 deletions
diff --git a/package/ffmpeg/ffmpeg.mk b/package/ffmpeg/ffmpeg.mk
index d4815cac6..d25346cd9 100644
--- a/package/ffmpeg/ffmpeg.mk
+++ b/package/ffmpeg/ffmpeg.mk
@@ -341,6 +341,13 @@ else
FFMPEG_CONF_OPTS += --disable-libx264
endif
+ifeq ($(BR2_PACKAGE_X265)$(BR2_PACKAGE_FFMPEG_GPL),yy)
+FFMPEG_CONF_OPTS += --enable-libx265
+FFMPEG_DEPENDENCIES += x265
+else
+FFMPEG_CONF_OPTS += --disable-libx265
+endif
+
ifeq ($(BR2_X86_CPU_HAS_MMX),y)
FFMPEG_CONF_OPTS += --enable-yasm
FFMPEG_DEPENDENCIES += host-yasm