From f241294662f3b48c10e527e9949aa2449e51739a Mon Sep 17 00:00:00 2001 From: Thijs Vermeir Date: Wed, 5 Mar 2014 16:39:30 +0100 Subject: x265enc: add x265 encoder element --- ext/Makefile.am | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) (limited to 'ext/Makefile.am') diff --git a/ext/Makefile.am b/ext/Makefile.am index 37eece025..3859cf773 100644 --- a/ext/Makefile.am +++ b/ext/Makefile.am @@ -406,6 +406,12 @@ else WEBP_DIR= endif +if USE_X265 +X265_DIR=x265 +else +X265_DIR= +endif + SUBDIRS=\ $(VOAACENC_DIR) \ $(ASSRENDER_DIR) \ @@ -473,7 +479,8 @@ SUBDIRS=\ $(ZBAR_DIR) \ $(RTMP_DIR) \ $(HLS_DIR) \ - $(WEBP_DIR) + $(WEBP_DIR) \ + $(X265_DIR) DIST_SUBDIRS = \ assrender \ @@ -538,6 +545,7 @@ DIST_SUBDIRS = \ xvid \ zbar \ rtmp \ - webp + webp \ + x265 include $(top_srcdir)/common/parallel-subdirs.mak -- cgit v1.2.1