Index: multimedia/x264/Makefile
===================================================================
--- multimedia/x264/Makefile
+++ multimedia/x264/Makefile
@@ -19,7 +19,7 @@
 
 PORTNAME=	x264
 PORTVERSION=	0.${X264_BUILD}.${X264_REV}
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	multimedia
 MASTER_SITES=	ftp://ftp.videolan.org/pub/videolan/x264/snapshots/ \
 		http://samples.mplayerhq.hu/yuv4mpeg2/:pgo
@@ -51,21 +51,27 @@
 SHEBANG_FILES=	configure
 PLIST_FILES?=	bin/x264
 
-OPTIONS_DEFINE?=	ASM DEBUG GCC GPAC LAVF PGO
-OPTIONS_DEFAULT?=	ASM GPAC
+OPTIONS_DEFINE?=	ASM DEBUG FFMS GCC GPAC LAVF LSMASH PGO
+OPTIONS_DEFAULT?=	ASM LSMASH
 
-GPAC_DESC=		MPEG-4 output support
+FFMS_DESC=		FFmpeg Source input support
+GPAC_DESC=		MPEG-4 output support via GPAC library
 LAVF_DESC=		libav* format input/output support (requires FFmpeg)
+LSMASH_DESC=		MPEG-4 output support via L-SMASH library
 
 ASM_CONFIGURE_OFF=	--disable-asm
 
 DEBUG_CONFIGURE_ON=	--enable-debug
 DEBUG_CONFIGURE_OFF=	--enable-strip
 
+FFMS_LIB_DEPENDS=	libffms2.so:multimedia/ffms2
+FFMS_CONFIGURE_OFF=	--disable-ffms
+
 GCC_VARS=		USE_GCC=yes
 
 GPAC_CONFIGURE_OFF=	--disable-gpac
 GPAC_LIB_DEPENDS=	libgpac.so:multimedia/gpac-libgpac
+GPAC_PREVENTS=		LSMASH
 
 LAVF_CONFIGURE_OFF=	--disable-swscale --disable-lavf
 LAVF_LIB_DEPENDS=	libavcodec.so:multimedia/ffmpeg \
@@ -73,6 +79,10 @@
 			libavutil.so:multimedia/ffmpeg \
 			libswscale.so:multimedia/ffmpeg
 
+LSMASH_LIB_DEPENDS=	liblsmash.so:multimedia/l-smash
+LSMASH_CONFIGURE_OFF=	--disable-lsmash
+LSMASH_PREVENTS=	GPAC
+
 PGO_DISTFILES=		${Y4M_VIDEO_DISTFILE}:pgo
 PGO_VARS=		USE_GCC=any
 PGO_MAKE_ENV=		VIDS="${WRKDIR}/${Y4M_VIDEO}"