Index: ffmpeg/Makefile
===================================================================
RCS file: /home/pcvs/ports/multimedia/ffmpeg/Makefile,v
retrieving revision 1.121
diff -u -p -r1.121 Makefile
--- ffmpeg/Makefile	29 Dec 2010 21:41:36 -0000	1.121
+++ ffmpeg/Makefile	17 Mar 2011 01:05:23 -0000
@@ -7,7 +7,7 @@
 
 PORTNAME=	ffmpeg
 PORTVERSION=	0.6.1
-PORTREVISION=	3
+PORTREVISION=	4
 PORTEPOCH=	1
 CATEGORIES=	multimedia audio ipv6 net
 MASTER_SITES=	http://ffmpeg.org/releases/
@@ -43,7 +43,8 @@ OPTIONS=	ALSA	"Enable alsa input/output 
 		SPEEX	"Speex audio decoder" off \
 		SSSE3	"Enable ssse3 support" on \
 		THEORA	"Theora encoder (implies OGG)" on \
-		VDPAU	"Nvidia vdpau support" off \
+		VAAPI	"VAAPI support" on \
+		VDPAU	"Nvidia vdpau support" on \
 		VORBIS	"Vorbis encoder via libvorbis (implies OGG)" on \
 		VP8	"VP8 codec via libvpx" on \
 		X264	"H.264 encoder" on \
@@ -272,6 +273,14 @@ CONFIGURE_ARGS+=	--enable-libtheora
 CONFIGURE_ARGS+=	--disable-libtheora
 .endif
 
+# vaapi
+.if defined(WITH_VAAPI)
+LIB_DEPENDS+=	va.1:${PORTSDIR}/multimedia/libva
+CONFIGURE_ARGS+=	--enable-vaapi
+.else
+CONFIGURE_ARGS+=	--disable-vaapi
+.endif
+
 # vdpau
 .ifndef(WITHOUT_VDPAU)
 LIB_DEPENDS+=	vdpau.1:${PORTSDIR}/multimedia/libvdpau
Index: ffmpeg-devel/Makefile
===================================================================
RCS file: /home/pcvs/ports/multimedia/ffmpeg-devel/Makefile,v
retrieving revision 1.136
diff -u -p -r1.136 Makefile
--- ffmpeg-devel/Makefile	14 Feb 2011 07:07:00 -0000	1.136
+++ ffmpeg-devel/Makefile	17 Mar 2011 01:05:28 -0000
@@ -7,10 +7,10 @@
 
 PORTNAME=	ffmpeg
 DISTVERSION=	2011-02-07
+PORTREVISION=	1
 CATEGORIES=	multimedia audio ipv6 net
 MASTER_SITES=	${MASTER_SITE_LOCAL}
 MASTER_SITE_SUBDIR=	mm
-		
 DISTNAME=	ffmpeg-${GIT_SUFFIX}
 
 MAINTAINER=	mm@FreeBSD.org
@@ -50,7 +50,8 @@ OPTIONS=	ALSA	"Enable alsa input/output 
 		SPEEX	"Speex audio decoder" off \
 		SSSE3	"SSSE3 support" on \
 		THEORA	"Theora encoder (implies OGG)" on \
-		VDPAU "NVidia vdpau support" off \
+		VAAPI	"VAAPI support" on \
+		VDPAU "NVidia vdpau support" on \
 		VORBIS	"Vorbis encoder via libvorbis (implies OGG)" on \
 		VP8	"VP8 codec via libvpx" on \
 		X264	"H.264 encoder" on \
@@ -288,6 +289,14 @@ CONFIGURE_ARGS+=	--enable-libtheora
 CONFIGURE_ARGS+=	--disable-libtheora
 .endif
 
+# vaapi
+.if defined(WITH_VAAPI)
+LIB_DEPENDS+=	va.1:${PORTSDIR}/multimedia/libva
+CONFIGURE_ARGS+=	--enable-vaapi
+.else
+CONFIGURE_ARGS+=	--disable-vaapi
+.endif
+
 # vdpau
 .ifndef(WITHOUT_VDPAU)
 LIB_DEPENDS+=   vdpau.1:${PORTSDIR}/multimedia/libvdpau