svn commit: r371232 - head/multimedia/ffmpeg24

[Thomas Zander]

Author: riggs
Date: Mon Oct 20 06:16:58 2014
New Revision: 371232
URL: https://svnweb.freebsd.org/changeset/ports/371232
QAT: https://qat.redports.org/buildarchive/r371232/

Log:
  - Merge OPTION to enable x265 from multimedia/ffmpeg
  
  Reported by: nox

Modified:
  head/multimedia/ffmpeg24/Makefile   (contents, props changed)

Modified: head/multimedia/ffmpeg24/Makefile
==============================================================================
--- head/multimedia/ffmpeg24/Makefile	Mon Oct 20 06:14:32 2014	(r371231)
+++ head/multimedia/ffmpeg24/Makefile	Mon Oct 20 06:16:58 2014	(r371232)
@@ -37,7 +37,7 @@ OPTIONS_DEFINE=	AACPLUS ALSA AMR_NB AMR_
 		JACK LAME LIBBLURAY LIBV4L MODPLUG OPENAL OPENCV OPENJPEG OPENSSL \
 		OPTIMIZED_CFLAGS OPUS PULSEAUDIO RTMP SCHROEDINGER SDL SPEEX \
 		THEORA VAAPI VDPAU VO_AACENC VO_AMRWBENC VORBIS VPX \
-		X11GRAB X264 XVID
+		X11GRAB X264 X265 XVID
 
 OPTIONS_DEFAULT=	FFSERVER FONTCONFIG FREETYPE FREI0R GNUTLS ICONV \
 			OPENCV SCHROEDINGER THEORA VORBIS VPX X264 XVID
@@ -204,6 +204,10 @@ VPX_CONFIGURE_ENABLE=	libvpx
 X264_LIB_DEPENDS=	libx264.so:${PORTSDIR}/multimedia/x264
 X264_CONFIGURE_ENABLE=	libx264
 
+# x265
+X265_LIB_DEPENDS=	libx265.so:${PORTSDIR}/multimedia/x265
+X265_CONFIGURE_ENABLE=	libx265
+
 # xvid
 XVID_LIB_DEPENDS=	libxvidcore.so:${PORTSDIR}/multimedia/xvid
 XVID_CONFIGURE_ENABLE=	libxvid