4 files changed, 13 insertions, 48 deletions

diff --git a/multimedia/ffmpeg-devel/Makefile b/multimedia/ffmpeg-devel/Makefile
index e40993a72e0c..1aa78b942a08 100644
--- a/multimedia/ffmpeg-devel/Makefile
+++ b/multimedia/ffmpeg-devel/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	ffmpeg
-DISTVERSION=	2011-03-21
+DISTVERSION=	2011-05-03
 CATEGORIES=	multimedia audio ipv6 net
 MASTER_SITES=	${MASTER_SITE_LOCAL}
 MASTER_SITE_SUBDIR=	mm
@@ -27,7 +27,7 @@ LICENSE_FILE_GPLv2=	${WRKSRC}/COPYING.GPLv2
 LICENSE_FILE_LGPL21=	${WRKSRC}/COPYING.LGPLv2.1
 LICENSE_COMB=	multi
 
-GIT_SNAPSHOT=	cf740790677b5101b59e33f4f40d375068c04ada
+GIT_SNAPSHOT=	c402ce418a9e7b456c383e097ad772f218a004c7
 GIT_SUFFIX=	${GIT_SNAPSHOT:C/^(.......).*$/\1/g}
 
 USE_XZ=		yes
@@ -85,7 +85,6 @@ COMPAT_HEADERS=libavcodec/avcodec.h \
 	libavutil/mem.h \
 	libavutil/pixfmt.h \
 	libavutil/rational.h \
-	libavutil/sha1.h \
 	libpostproc/postprocess.h \
 	libswscale/swscale.h
 
diff --git a/multimedia/ffmpeg-devel/distinfo b/multimedia/ffmpeg-devel/distinfo
index c941a0ac0e21..4dfa45ce8b50 100644
--- a/multimedia/ffmpeg-devel/distinfo
+++ b/multimedia/ffmpeg-devel/distinfo
@@ -1,2 +1,2 @@
-SHA256 (ffmpeg-cf74079.tar.xz) = acce17a20cc10ff485d50228a6e31c270329d7b758898f1b1a35747d97be6263
-SIZE (ffmpeg-cf74079.tar.xz) = 3664568
+SHA256 (ffmpeg-c402ce4.tar.xz) = 272557e9e04a2424ce3edb3e8e7c0899bd2d627c19671d3d241c5885f5fb66df
+SIZE (ffmpeg-c402ce4.tar.xz) = 3784648
diff --git a/multimedia/ffmpeg-devel/files/patch-libswscale-utils.h b/multimedia/ffmpeg-devel/files/patch-libswscale-utils.h
deleted file mode 100644
index c0725a5d9a22..000000000000
--- a/multimedia/ffmpeg-devel/files/patch-libswscale-utils.h
+++ /dev/null
@@ -1,14 +0,0 @@
---- libswscale/utils.c.orig	2010-12-21 01:01:42.465502681 +0100
-+++ libswscale/utils.c	2010-12-21 01:01:45.816480317 +0100
-@@ -915,7 +915,11 @@
-             c->chrMmx2FilterCode = av_malloc(c->chrMmx2FilterCodeSize);
- #endif
- 
-+#ifdef MAP_ANONYMOUS
-+            if (c->lumMmx2FilterCode == MAP_FAILED || c->chrMmx2FilterCode == MAP_FAILED)
-+#else
-             if (!c->lumMmx2FilterCode || !c->chrMmx2FilterCode)
-+#endif
-                 return AVERROR(ENOMEM);
-             FF_ALLOCZ_OR_GOTO(c, c->hLumFilter   , (dstW        /8+8)*sizeof(int16_t), fail);
-             FF_ALLOCZ_OR_GOTO(c, c->hChrFilter   , (c->chrDstW  /4+8)*sizeof(int16_t), fail);
diff --git a/multimedia/ffmpeg-devel/pkg-plist b/multimedia/ffmpeg-devel/pkg-plist
index b6caa930aa47..61ae7544e0e3 100644
--- a/multimedia/ffmpeg-devel/pkg-plist
+++ b/multimedia/ffmpeg-devel/pkg-plist
@@ -26,7 +26,6 @@ include/ffmpeg/opt.h
 include/ffmpeg/pixfmt.h
 include/ffmpeg/postprocess.h
 include/ffmpeg/rational.h
-include/ffmpeg/sha1.h
 include/ffmpeg/swscale.h
 include/ffmpeg/vdpau.h
 include/ffmpeg/xvmc.h
@@ -36,6 +35,7 @@ include/libavcodec/dxva2.h
 include/libavcodec/opt.h
 include/libavcodec/vaapi.h
 include/libavcodec/vdpau.h
+include/libavcodec/version.h
 include/libavcodec/xvmc.h
 include/libavdevice/avdevice.h
 include/libavfilter/avfilter.h
@@ -44,6 +44,7 @@ include/libavformat/avformat.h
 include/libavformat/avio.h
 include/libavformat/version.h
 include/libavutil/adler32.h
+include/libavutil/aes.h
 include/libavutil/attributes.h
 include/libavutil/audioconvert.h
 include/libavutil/avassert.h
@@ -75,37 +76,37 @@ include/libavutil/pixfmt.h
 include/libavutil/random_seed.h
 include/libavutil/rational.h
 include/libavutil/samplefmt.h
-include/libavutil/sha1.h
+include/libavutil/sha.h
 include/libpostproc/postprocess.h
 include/postproc/postprocess.h
 include/libswscale/swscale.h
 lib/libavcodec.a
 lib/libavcodec.so
 lib/libavcodec.so.1
-lib/libavcodec.so.52.114.0
+lib/libavcodec.so.53.3.0
 lib/libavdevice.a
 lib/libavdevice.so
 lib/libavdevice.so.1
-lib/libavdevice.so.52.3.0
+lib/libavdevice.so.53.0.0
 lib/libavfilter.a
 lib/libavfilter.so
-lib/libavfilter.so.1.76.0
+lib/libavfilter.so.2.4.0
 lib/libavfilter.so.1
 lib/libavformat.a
 lib/libavformat.so
 lib/libavformat.so.1
-lib/libavformat.so.52.103.0
+lib/libavformat.so.53.0.3
 lib/libavutil.a
 lib/libavutil.so
 lib/libavutil.so.1
-lib/libavutil.so.50.40.0
+lib/libavutil.so.51.2.0
 lib/libpostproc.a
 lib/libpostproc.so
 lib/libpostproc.so.1
 lib/libpostproc.so.51.2.0
 lib/libswscale.a
 lib/libswscale.so
-lib/libswscale.so.0.12.0
+lib/libswscale.so.0.14.0
 lib/libswscale.so.1
 libdata/pkgconfig/libavcodec.pc
 libdata/pkgconfig/libavdevice.pc
@@ -115,10 +116,6 @@ libdata/pkgconfig/libavutil.pc
 libdata/pkgconfig/libpostproc.pc
 libdata/pkgconfig/libswscale.pc
 %%DATADIR%%/libx264-baseline.ffpreset
-%%DATADIR%%/libx264-fast.ffpreset
-%%DATADIR%%/libx264-fast_firstpass.ffpreset
-%%DATADIR%%/libx264-faster.ffpreset
-%%DATADIR%%/libx264-faster_firstpass.ffpreset
 %%DATADIR%%/libx264-ipod320.ffpreset
 %%DATADIR%%/libx264-ipod640.ffpreset
 %%DATADIR%%/libx264-lossless_fast.ffpreset
@@ -127,23 +124,6 @@ libdata/pkgconfig/libswscale.pc
 %%DATADIR%%/libx264-lossless_slow.ffpreset
 %%DATADIR%%/libx264-lossless_slower.ffpreset
 %%DATADIR%%/libx264-lossless_ultrafast.ffpreset
-%%DATADIR%%/libx264-main.ffpreset
-%%DATADIR%%/libx264-medium.ffpreset
-%%DATADIR%%/libx264-medium_firstpass.ffpreset
-%%DATADIR%%/libx264-placebo.ffpreset
-%%DATADIR%%/libx264-placebo_firstpass.ffpreset
-%%DATADIR%%/libx264-slow.ffpreset
-%%DATADIR%%/libx264-slow_firstpass.ffpreset
-%%DATADIR%%/libx264-slower.ffpreset
-%%DATADIR%%/libx264-slower_firstpass.ffpreset
-%%DATADIR%%/libx264-superfast.ffpreset
-%%DATADIR%%/libx264-superfast_firstpass.ffpreset
-%%DATADIR%%/libx264-ultrafast.ffpreset
-%%DATADIR%%/libx264-ultrafast_firstpass.ffpreset
-%%DATADIR%%/libx264-veryfast.ffpreset
-%%DATADIR%%/libx264-veryfast_firstpass.ffpreset
-%%DATADIR%%/libx264-veryslow.ffpreset
-%%DATADIR%%/libx264-veryslow_firstpass.ffpreset
 @dirrm %%DATADIR%%/
 @dirrm include/postproc
 @dirrm include/libswscale