3 files changed, 20 insertions, 11 deletions

diff --git a/multimedia/ffmpeg-devel/Makefile b/multimedia/ffmpeg-devel/Makefile
index 6ae3deece6c0..763825969ba6 100644
--- a/multimedia/ffmpeg-devel/Makefile
+++ b/multimedia/ffmpeg-devel/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	ffmpeg
-DISTVERSION=	2010-11-30
-PORTREVISION=	2
+DISTVERSION=	2010-12-29
 CATEGORIES=	multimedia audio ipv6 net
 MASTER_SITES=	${MASTER_SITE_LOCAL}
 MASTER_SITE_SUBDIR=	mm
@@ -47,6 +46,7 @@ OPTIONS=	ALSA	"Enable alsa input/output device" off \
 		SPEEX	"Speex audio decoder" off \
 		SSSE3	"SSSE3 support" on \
 		THEORA	"Theora encoder (implies OGG)" on \
+		VDPAU "NVidia vdpau support" off \
 		VORBIS	"Vorbis encoder via libvorbis (implies OGG)" on \
 		VP8	"VP8 codec via libvpx" on \
 		X264	"H.264 encoder" on \
@@ -107,8 +107,8 @@ DOC_FILES=	Changelog COPYING.GPLv2 COPYING.GPLv3 COPYING.LGPLv2.1 \
 		COPYING.LGPLv3 CREDITS INSTALL LICENSE MAINTAINERS README
 # under doc subdirectory
 DOC_DOCFILES=	APIchanges TODO avutil.txt developer.html faq.html \
-		ffmpeg-doc.html ffplay-doc.html ffprobe-doc.html \
-		ffserver-doc.html general.html issue_tracker.txt \
+		ffmpeg.html ffplay.html ffprobe.html \
+		ffserver.html general.html issue_tracker.txt \
 		libavfilter.html optimization.txt rate_distortion.txt \
 		snow.txt soc.txt swscale.txt tablegen.txt viterbi.txt
 PORTDOCS=	*
@@ -283,6 +283,14 @@ CONFIGURE_ARGS+=	--enable-libtheora
 CONFIGURE_ARGS+=	--disable-libtheora
 .endif
 
+# vdpau
+.ifndef(WITHOUT_VDPAU)
+LIB_DEPENDS+=   vdpau.1:${PORTSDIR}/multimedia/libvdpau
+CONFIGURE_ARGS+=	--enable-vdpau
+.else
+CONFIGURE_ARGS+=	--disable-vdpau
+.endif
+
 # vorbis
 .ifndef(WITHOUT_VORBIS)
 LIB_DEPENDS+=	vorbisenc.2:${PORTSDIR}/audio/libvorbis
diff --git a/multimedia/ffmpeg-devel/distinfo b/multimedia/ffmpeg-devel/distinfo
index afe0d5e7bf7f..d8af839ee589 100644
--- a/multimedia/ffmpeg-devel/distinfo
+++ b/multimedia/ffmpeg-devel/distinfo
@@ -1,2 +1,2 @@
-SHA256 (ffmpeg-2010-11-30.tar.xz) = 05450cb6653c5fb28422512b913cdcad976e6c48edee6c3eed2d0c4042928379
-SIZE (ffmpeg-2010-11-30.tar.xz) = 3404296
+SHA256 (ffmpeg-2010-12-29.tar.xz) = ad01fa31c9eea7f3b9fe9e0ffb3ed0f382f9cddb2e4e2586c1ca76f56831aaf9
+SIZE (ffmpeg-2010-12-29.tar.xz) = 3469364
diff --git a/multimedia/ffmpeg-devel/pkg-plist b/multimedia/ffmpeg-devel/pkg-plist
index cd59ee37a903..1034c1e9b80c 100644
--- a/multimedia/ffmpeg-devel/pkg-plist
+++ b/multimedia/ffmpeg-devel/pkg-plist
@@ -61,6 +61,7 @@ include/libavutil/crc.h
 include/libavutil/error.h
 include/libavutil/eval.h
 include/libavutil/fifo.h
+include/libavutil/file.h
 include/libavutil/intfloat_readwrite.h
 include/libavutil/intreadwrite.h
 include/libavutil/lfg.h
@@ -81,10 +82,10 @@ include/libswscale/swscale.h
 lib/libavcodec.a
 lib/libavcodec.so
 lib/libavcodec.so.1
-lib/libavcodec.so.52.97.2
+lib/libavcodec.so.52.101.0
 lib/libavcore.a
 lib/libavcore.so
-lib/libavcore.so.0.14.0
+lib/libavcore.so.0.16.0
 lib/libavcore.so.1
 lib/libavdevice.a
 lib/libavdevice.so
@@ -92,16 +93,16 @@ lib/libavdevice.so.1
 lib/libavdevice.so.52.2.2
 lib/libavfilter.a
 lib/libavfilter.so
-lib/libavfilter.so.1.65.0
+lib/libavfilter.so.1.72.0
 lib/libavfilter.so.1
 lib/libavformat.a
 lib/libavformat.so
 lib/libavformat.so.1
-lib/libavformat.so.52.87.1
+lib/libavformat.so.52.91.0
 lib/libavutil.a
 lib/libavutil.so
 lib/libavutil.so.1
-lib/libavutil.so.50.33.0
+lib/libavutil.so.50.36.0
 lib/libpostproc.a
 lib/libpostproc.so
 lib/libpostproc.so.1