6 files changed, 161 insertions, 146 deletions

diff --git a/multimedia/ffmpeg/Makefile b/multimedia/ffmpeg/Makefile
index 6881d7e6b5f4..72d995037810 100644
--- a/multimedia/ffmpeg/Makefile
+++ b/multimedia/ffmpeg/Makefile
@@ -6,8 +6,7 @@
 #      $Id: Makefile 77 2008-07-27 21:50:37Z buhnux $
 
 PORTNAME=	ffmpeg
-PORTVERSION=	0.6.3
-PORTREVISION=	2
+PORTVERSION=	0.7.1
 PORTEPOCH=	1
 CATEGORIES=	multimedia audio ipv6 net
 MASTER_SITES=	http://ffmpeg.org/releases/
@@ -19,11 +18,6 @@ BUILD_DEPENDS=	yasm:${PORTSDIR}/devel/yasm
 
 CONFLICTS=	ffmpeg-20*
 
-LICENSE=	GPLv2 LGPL21
-LICENSE_COMB=	multi
-LICENSE_FILE_GPLv2=	${WRKSRC}/COPYING.GPLv2
-LICENSE_FILE_LGPL21=	${WRKSRC}/COPYING.LGPLv2.1
-
 HAS_CONFIGURE=	yes
 CONFIGURE_LOG=	config.err
 USE_BZIP2=	yes
@@ -34,15 +28,18 @@ WANT_SDL=	yes
 OPTIONS=	ALSA	"Enable alsa input/output device" off \
 		AMR_NB	"AMR Narrow Band encoder (opencore)" off \
 		AMR_WB	"AMR Wide Band encoder (opencore)" off \
+		CELT	"Enable CELT/Opus decoding via libcelt" off \
 		CPUDETECT "Enable runtime CPU detection" on \
 		DIRAC	"Dirac codec via libdirac" off \
 		FAAC	"FAAC mp4/aac audio encoder" off \
-		FAAD	"FAAD mp4/aac audio decoder" on \
 		FFSERVER "Build and install ffserver" on \
+		FREETYPE "Enable libfreetype" on \
+		FREI0R	"Frei0r wrapper filter" off \
 		GSM	"GSM audio codec" off \
 		LAME	"LAME MP3 encoder" off \
 		OPENJPEG	"JPEG 2000 decoder" off \
 		OPTIMIZED_CFLAGS "Additional optimizations" off \
+		RTMP	"RTMP[E] support via librtmp" off \
 		SCHROEDINGER	"Dirac codec via libschroedinger" on \
 		SDL	"SDL support (build ffplay)" off \
 		SPEEX	"Speex audio decoder" off \
@@ -50,6 +47,8 @@ OPTIONS=	ALSA	"Enable alsa input/output device" off \
 		THEORA	"Theora encoder (implies OGG)" on \
 		VAAPI	"VAAPI decoder support" off \
 		VDPAU	"Nvidia vdpau support" off \
+		VO_AACENC "AAC audio encoder (vo-aacenc)" off \
+		VO_AMRWBENC "AMR Wide Band audio encoder (vo-amrwbenc)" off \
 		VORBIS	"Vorbis encoder via libvorbis (implies OGG)" on \
 		VP8	"VP8 codec via libvpx" on \
 		X264	"H.264 encoder" on \
@@ -90,7 +89,6 @@ CONFIGURE_ARGS+=--prefix="${PREFIX}" \
 		--enable-gpl \
 		--enable-postproc \
 		--enable-avfilter \
-		--enable-avfilter-lavf \
 		--enable-pthreads \
 		--enable-x11grab \
 		--enable-memalign-hack \
@@ -102,13 +100,13 @@ SHLIB_VER=	1
 PLIST_SUB=	SHLIB_VER=${SHLIB_VER}
 USE_LDCONFIG=	yes
 
-DOC_FILES=	Changelog CREDITS INSTALL LICENSE MAINTAINERS README RELEASE
+DOC_FILES=	CREDITS INSTALL LICENSE MAINTAINERS README RELEASE
 # under doc subdirectory
-DOC_DOCFILES=	APIchanges TODO avutil.txt developer.html faq.html \
-		ffmpeg_powerpc_performance_evaluation_howto.txt \
-		ffmpeg-doc.html ffplay-doc.html ffprobe-doc.html \
-		ffserver-doc.html general.html issue_tracker.txt \
-		libavfilter.html optimization.txt rate_distortion.txt \
+DOC_DOCFILES=	APIchanges TODO avutil.txt build_system.txt \
+		developer.html faq.html fate.txt ffmpeg-mt-authorship.txt \
+		ffmpeg.html ffprobe.html ffserver.html general.html \
+		git-howto.txt issue_tracker.txt libavfilter.html \
+		multithreading.txt optimization.txt rate_distortion.txt \
 		snow.txt soc.txt swscale.txt tablegen.txt viterbi.txt
 PORTDOCS=	*
 
@@ -128,7 +126,7 @@ CONFIGURE_ENV+=	COMPILER_PATH=${LOCALBASE}/bin
 MAKE_ENV+=	COMPILER_PATH=${LOCALBASE}/bin
 .endif
 
-.ifndef(WITHOUT_FFSERVER)
+.if !defined(WITHOUT_FFSERVER)
 USE_RC_SUBR=	ffserver
 .endif
 
@@ -151,10 +149,10 @@ FFMPEG_CFLAGS+=		-msse
 .endif
 
 # PORTDOCS
-.ifndef(NOPORTDOCS)
+.if !defined(NOPORTDOCS)
 BUILD_DEPENDS+=		texi2html:${PORTSDIR}/textproc/texi2html
 MAN1+=		ffmpeg.1 ffprobe.1
-. ifndef(WITHOUT_FFSERVER)
+. if !defined(WITHOUT_FFSERVER)
 MAN1+=		ffserver.1
 . endif
 .endif
@@ -174,27 +172,34 @@ CONFIGURE_ARGS+=	--disable-indev=alsa \
 
 # amr
 .if defined(WITH_AMR_NB) || defined(WITH_AMR_WB)
-LICENSE=		GPLv3 LGPL3
-LICENSE_FILE_GPLv3=	${WRKSRC}/COPYING.GPLv3
-LICENSE_FILE_LGPL3=	${WRKSRC}/COPYING.LGPLv3
-CONFIGURE_ARGS+=	--enable-version3
+
 LIB_DEPENDS+=	opencore-amrnb.0:${PORTSDIR}/audio/opencore-amr
 .endif
 
-.ifdef(WITH_AMR_NB)
+.if defined(WITH_AMR_NB)
+FFMPEG_LICENSE_GPL3=	yes
 CONFIGURE_ARGS+=	--enable-libopencore-amrnb
 .else
 CONFIGURE_ARGS+=	--disable-libopencore-amrnb
 .endif
 
-.ifdef(WITH_AMR_WB)
+.if defined(WITH_AMR_WB)
+FFMPEG_LICENSE_GPL3=	yes
 CONFIGURE_ARGS+=	--enable-libopencore-amrwb
 .else
 CONFIGURE_ARGS+=	--disable-libopencore-amrwb
 .endif
 
+# celt
+.if defined(WITH_CELT)
+LIB_DEPENDS+=	celt0.2:${PORTSDIR}/audio/celt
+CONFIGURE_ARGS+=	--enable-libcelt
+.else
+CONFIGURE_ARGS+=	--disable-libcelt
+.endif
+
 # dirac
-.ifdef(WITH_DIRAC)
+.if defined(WITH_DIRAC)
 LIB_DEPENDS+=	dirac_encoder.1:${PORTSDIR}/multimedia/dirac
 CONFIGURE_ARGS+=	--enable-libdirac
 .else
@@ -202,7 +207,7 @@ CONFIGURE_ARGS+=	--disable-libdirac
 .endif
 
 # faac
-.ifdef(WITH_FAAC)
+.if defined(WITH_FAAC)
 RESTRICTED=	linking to libfaac restricts redistribution
 LIB_DEPENDS+=	faac.0:${PORTSDIR}/audio/faac
 CONFIGURE_ARGS+=	--enable-libfaac --enable-nonfree
@@ -210,25 +215,32 @@ CONFIGURE_ARGS+=	--enable-libfaac --enable-nonfree
 CONFIGURE_ARGS+=	--disable-libfaac
 .endif
 
-# faad
-.ifndef(WITHOUT_FAAD)
-LIB_DEPENDS+=	faad.2:${PORTSDIR}/audio/faad
-CONFIGURE_ARGS+=	--enable-libfaad \
-			--enable-libfaadbin
-.else
-CONFIGURE_ARGS+=	--disable-libfaad
-.endif
-
 # ffserver
-.ifndef(WITHOUT_FFSERVER)
+.if !defined(WITHOUT_FFSERVER)
 PLIST_SUB+=	FFSERVER=""
 .else
 PLIST_SUB+=	FFSERVER="@comment "
 CONFIGURE_ARGS+=	--disable-ffserver
 .endif
 
+# freetype
+.if !defined(WITHOUT_FREETYPE)
+LIB_DEPENDS+=	freetype.9:${PORTSDIR}/print/freetype2
+CONFIGURE_ARGS+=	--enable-libfreetype
+.else
+CONFIGURE_ARGS+=	--disable-libfreetype
+.endif
+
+# frei0r
+.if defined(WITH_FREI0R)
+BUILD_DEPENDS+=	${LOCALBASE}/include/frei0r.h:${PORTSDIR}/graphics/frei0r
+CONFIGURE_ARGS+=	--enable-frei0r
+.else
+CONFIGURE_ARGS+=	--disable-frei0r
+.endif
+
 # gsm
-.ifdef(WITH_GSM)
+.if defined(WITH_GSM)
 LIB_DEPENDS+=	gsm.1:${PORTSDIR}/audio/gsm
 CONFIGURE_ARGS+=	--enable-libgsm
 .else
@@ -236,23 +248,40 @@ CONFIGURE_ARGS+=	--disable-libgsm
 .endif
 
 # mp3
-.ifdef(WITH_LAME)
+.if defined(WITH_LAME)
 LIB_DEPENDS+=	mp3lame.0:${PORTSDIR}/audio/lame
 CONFIGURE_ARGS+=	--enable-libmp3lame
 .else
 CONFIGURE_ARGS+=	--disable-libmp3lame
 .endif
 
+# Not supported because of possible cyclic dependencies
+# opencv
+#.if defined(WITH_OPENCV)
+#LIB_DEPENDS+=	cv.2:${PORTSDIR}/graphics/opencv
+#CONFIGURE_ARGS+=	--enable-libopencv
+#.else
+CONFIGURE_ARGS+=	--disable-libopencv
+#.endif
+
 # openjpeg
-.ifdef(WITH_OPENJPEG)
+.if defined(WITH_OPENJPEG)
 LIB_DEPENDS+=	openjpeg.2:${PORTSDIR}/graphics/openjpeg
 CONFIGURE_ARGS+=	--enable-libopenjpeg
 .else
 CONFIGURE_ARGS+=	--disable-libopenjpeg
 .endif
 
+# rtmp
+.if defined(WITH_RTMP)
+LIB_DEPENDS+=	rtmp.0:${PORTSDIR}/multimedia/rtmpdump
+CONFIGURE_ARGS+=	--enable-librtmp
+.else
+CONFIGURE_ARGS+=	--disable-librtmp
+.endif
+
 # schroedinger
-.ifndef(WITHOUT_SCHROEDINGER)
+.if !defined(WITHOUT_SCHROEDINGER)
 LIB_DEPENDS+=	schroedinger-1.0.10:${PORTSDIR}/multimedia/schroedinger
 CONFIGURE_ARGS+=	--enable-libschroedinger
 .else
@@ -260,7 +289,7 @@ CONFIGURE_ARGS+=	--disable-libschroedinger
 .endif
 
 # sdl
-.ifdef(WITH_SDL)
+.if defined(WITH_SDL)
 USE_SDL+=	sdl
 PLIST_FILES+=	bin/ffplay
 .if !defined(NOPORTDOCS)
@@ -271,7 +300,7 @@ CONFIGURE_ARGS+=	--disable-ffplay
 .endif
 
 # speex
-.ifdef(WITH_SPEEX)
+.if defined(WITH_SPEEX)
 LIB_DEPENDS+=	speex.1:${PORTSDIR}/audio/speex
 CONFIGURE_ARGS+=	--enable-libspeex
 .else
@@ -279,15 +308,33 @@ CONFIGURE_ARGS+=	--disable-libspeex
 .endif
 
 # theora
-.ifndef(WITHOUT_THEORA)
+.if !defined(WITHOUT_THEORA)
 LIB_DEPENDS+=	theora.0:${PORTSDIR}/multimedia/libtheora
 CONFIGURE_ARGS+=	--enable-libtheora
 .else
 CONFIGURE_ARGS+=	--disable-libtheora
 .endif
 
+# vo-aacenc
+.if defined(WITH_VO_AACENC)
+LIB_DEPENDS+=	vo-aacenc.0:${PORTSDIR}/audio/vo-aacenc
+CONFIGURE_ARGS+=	--enable-libvo-aacenc
+.else
+CONFIGURE_ARGS+=	--disable-libvo-aacenc
+.endif
+
+# vo-amrwbenc
+.if defined(WITH_VO_AMRWBENC)
+FFMPEG_LICENSE_GPL3=	yes
+LIB_DEPENDS+=	vo-amrwbenc.0:${PORTSDIR}/audio/vo-amrwbenc
+CONFIGURE_ARGS+=	--enable-libvo-amrwbenc
+.else
+CONFIGURE_ARGS+=	--disable-libvo-amrwbenc
+.endif
+
 # vaapi
-.ifndef(WITHOUT_VAAPI)
+.if !defined(WITHOUT_VAAPI)
+FFMPEG_LICENSE_GPL3=	yes
 LIB_DEPENDS+=	va.1:${PORTSDIR}/multimedia/libva
 CONFIGURE_ARGS+=	--enable-vaapi
 .else
@@ -295,7 +342,7 @@ CONFIGURE_ARGS+=	--disable-vaapi
 .endif
 
 # vdpau
-.ifndef(WITHOUT_VDPAU)
+.if !defined(WITHOUT_VDPAU)
 BUILD_DEPENDS+=	${LOCALBASE}/include/vdpau/vdpau.h:${PORTSDIR}/multimedia/libvdpau
 CONFIGURE_ARGS+=	--enable-vdpau
 .else
@@ -303,7 +350,7 @@ CONFIGURE_ARGS+=	--disable-vdpau
 .endif
 
 # vorbis
-.ifndef(WITHOUT_VORBIS)
+.if !defined(WITHOUT_VORBIS)
 LIB_DEPENDS+=	vorbisenc.2:${PORTSDIR}/audio/libvorbis
 CONFIGURE_ARGS+=	--enable-libvorbis
 FFMPEG_CFLAGS+=		-I${LOCALBASE}/include/vorbis
@@ -312,7 +359,7 @@ CONFIGURE_ARGS+=	--disable-libvorbis
 .endif
 
 # vp8
-.ifndef(WITHOUT_VP8)
+.if !defined(WITHOUT_VP8)
 LIB_DEPENDS+=	vpx.0:${PORTSDIR}/multimedia/libvpx
 CONFIGURE_ARGS+=	--enable-libvpx
 .else
@@ -320,7 +367,7 @@ CONFIGURE_ARGS+=	--disable-libvpx
 .endif
 
 # x264
-.ifndef(WITHOUT_X264)
+.if !defined(WITHOUT_X264)
 LIB_DEPENDS+=	x264.115:${PORTSDIR}/multimedia/x264
 CONFIGURE_ARGS+=	--enable-libx264
 .else
@@ -328,21 +375,32 @@ CONFIGURE_ARGS+=	--disable-libx264
 .endif
 
 # xvid
-.ifndef(WITHOUT_XVID)
+.if !defined(WITHOUT_XVID)
 LIB_DEPENDS+=	xvidcore.4:${PORTSDIR}/multimedia/xvid
 CONFIGURE_ARGS+=	--enable-libxvid
 .else
 CONFIGURE_ARGS+=	--disable-libxvid
 .endif
 
+# License knobs
+LICENSE_COMB=	multi
+.if defined(FFMPEG_LICENSE_GPL3)
+LICENSE=		GPLv3 LGPL3
+LICENSE_FILE_GPLv3=	${WRKSRC}/COPYING.GPLv3
+LICENSE_FILE_LGPL3=	${WRKSRC}/COPYING.LGPLv3
+CONFIGURE_ARGS+=	--enable-version3
+.else
+LICENSE=		GPLv2 LGPL21
+LICENSE_FILE_GPLv2=	${WRKSRC}/COPYING.GPLv2
+LICENSE_FILE_LGPL21=	${WRKSRC}/COPYING.LGPLv2.1
+.endif
+
 pre-configure:
 .if defined(WITHOUT_OGG) && (!defined(WITHOUT_VORBIS) || !defined(WITHOUT_THEORA))
 	@${ECHO_MSG}	WITH_VORBIS or WITH_THEORA defined, libogg will be built
 .endif
 
 post-patch:
-# faad compat
-	@${REINPLACE_CMD} -e 's|faacD|NeAACD|' ${WRKSRC}/libavcodec/libfaad.c
 # {C,LD}FLAGS safeness
 	@${REINPLACE_CMD} -e 's|$$(LIBDIR)/pkgconfig|${PREFIX}/libdata/pkgconfig|' \
 		${WRKSRC}/subdir.mak
@@ -356,7 +414,7 @@ post-patch:
 		${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT}
 	@${REINPLACE_CMD} -e 's|-ldl||; s|$$(LIBMAJOR)|${SHLIB_VER}|g;' \
 		${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT}
-.ifdef(WITH_SDL)
+.if defined(WITH_SDL)
 	@${REINPLACE_CMD} -E \
 		-e 's|sdl-config|${SDL_CONFIG}|g' \
 		${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT}
@@ -366,20 +424,20 @@ post-patch:
 .endif
 
 post-configure:
-.ifdef(WITHOUT_THEORA)
+.if defined(WITHOUT_THEORA)
 	@${REINPLACE_CMD} -E \
 		-e 's|^(CONFIG_LIBTHEORA).*$$|\1=no|' \
 		${WRKSRC}/config.mak
 .endif
 
 post-install:
-.ifndef(WITHOUT_FFSERVER)
+.if !defined(WITHOUT_FFSERVER)
 	${INSTALL_DATA} ${WRKSRC}/doc/ffserver.conf ${PREFIX}/etc/ffserver.conf-dist
 	if [ ! -f ${PREFIX}/etc/ffserver.conf ]; then \
 		${INSTALL_DATA} ${WRKSRC}/doc/ffserver.conf ${PREFIX}/etc; \
 	fi
 .endif
-.ifndef(NOPORTDOCS)
+.if !defined(NOPORTDOCS)
 	${MKDIR} ${DOCSDIR}
 .for FILE in ${DOC_FILES}
 	${INSTALL_DATA} ${WRKSRC}/${FILE} ${DOCSDIR}
diff --git a/multimedia/ffmpeg/distinfo b/multimedia/ffmpeg/distinfo
index 6e81231c4b0a..6baab3f559c6 100644
--- a/multimedia/ffmpeg/distinfo
+++ b/multimedia/ffmpeg/distinfo
@@ -1,2 +1,2 @@
-SHA256 (ffmpeg-0.6.3.tar.bz2) = 693867974a32f3dfe4131048d9ab97620710ff2eb82785462fba1f307493cf41
-SIZE (ffmpeg-0.6.3.tar.bz2) = 3750617
+SHA256 (ffmpeg-0.7.1.tar.bz2) = 243a770661b52cfa57bd59ab20b417f13bf8d076887f3c32bce533cbf92dea03
+SIZE (ffmpeg-0.7.1.tar.bz2) = 4555714
diff --git a/multimedia/ffmpeg/files/patch-configure b/multimedia/ffmpeg/files/patch-configure
index ccf595dadefa..5e0f7e987e47 100644
--- a/multimedia/ffmpeg/files/patch-configure
+++ b/multimedia/ffmpeg/files/patch-configure
@@ -1,6 +1,6 @@
---- configure.orig	2010-06-15 21:44:30.000000000 +0200
-+++ configure	2010-12-12 22:19:20.533163967 +0100
-@@ -1469,7 +1469,7 @@
+--- configure.orig	2011-06-21 21:29:25.000000000 +0200
++++ configure	2011-06-23 13:36:46.099381871 +0200
+@@ -1657,7 +1657,7 @@
  nm_opts='-g'
  
  # machine
@@ -9,28 +9,10 @@
  cpu="generic"
  
  # OS
-@@ -1514,7 +1514,7 @@
- 
- CC_O='-o $@'
- 
--host_cflags='-D_ISOC99_SOURCE -D_POSIX_C_SOURCE=200112 -O3 -g -Wall'
-+host_cflags='-D_ISOC99_SOURCE -O3 -g -Wall'
- host_libs='-lm'
- 
- target_path='$(CURDIR)'
-@@ -2096,7 +2096,7 @@
-     die "C compiler test failed."
- fi
- 
--add_cppflags -D_ISOC99_SOURCE -D_POSIX_C_SOURCE=200112
-+add_cppflags -D_ISOC99_SOURCE
- check_cflags -std=c99
- check_cc -D_FILE_OFFSET_BITS=64 <<EOF && add_cppflags -D_FILE_OFFSET_BITS=64
- #include <stdlib.h>
-@@ -2678,8 +2678,8 @@
-     fi
- fi
+@@ -2966,8 +2966,8 @@
+ texi2html -version > /dev/null 2>&1 && enable texi2html || disable texi2html
  
+ check_header linux/fb.h
 -check_header linux/videodev.h
 -check_header linux/videodev2.h
 +#check_header linux/videodev.h
@@ -38,10 +20,10 @@
  check_header sys/videoio.h
  
  check_func_headers "windows.h vfw.h" capCreateCaptureWindow "$vfwcap_indev_extralibs"
-@@ -2986,7 +2986,7 @@
+@@ -3322,7 +3322,7 @@
  SRC_PATH="$source_path"
  SRC_PATH_BARE=$source_path
- BUILD_ROOT="$PWD"
+ CC_IDENT=$cc_ident
 -ARCH=$arch
 +FFMPEG_ARCH=$arch
  CC=$cc
diff --git a/multimedia/ffmpeg/files/patch-libavdevice-bktr.c b/multimedia/ffmpeg/files/patch-libavdevice-bktr.c
index 8ed9552eba79..541775966313 100644
--- a/multimedia/ffmpeg/files/patch-libavdevice-bktr.c
+++ b/multimedia/ffmpeg/files/patch-libavdevice-bktr.c
@@ -1,5 +1,5 @@
---- libavdevice/bktr.c.orig	2009-05-15 17:34:55.000000000 +0200
-+++ libavdevice/bktr.c	2009-05-15 17:38:01.000000000 +0200
+--- libavdevice/bktr.c.orig	2011-06-21 21:29:25.000000000 +0200
++++ libavdevice/bktr.c	2011-06-23 13:39:44.160881669 +0200
 @@ -24,6 +24,11 @@
   * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
   */
@@ -9,6 +9,6 @@
 +typedef unsigned int	u_int;
 +typedef unsigned long	u_long;
 +
- #define _BSD_SOURCE 1
- #include "libavformat/avformat.h"
- #if HAVE_DEV_BKTR_IOCTL_METEOR_H && HAVE_DEV_BKTR_IOCTL_BT848_H
+ #include "libavutil/log.h"
+ #include "libavutil/opt.h"
+ #include "libavutil/parseutils.h"
diff --git a/multimedia/ffmpeg/files/patch-libswscale-utils.h b/multimedia/ffmpeg/files/patch-libswscale-utils.h
deleted file mode 100644
index f923a3de8bbd..000000000000
--- a/multimedia/ffmpeg/files/patch-libswscale-utils.h
+++ /dev/null
@@ -1,25 +0,0 @@
---- libswscale/utils.c.orig	2010-12-17 18:58:26.307218801 +0200
-+++ libswscale/utils.c	2010-12-17 19:00:13.409221287 +0200
-@@ -955,8 +955,8 @@
-             c->chrMmx2FilterCodeSize = initMMX2HScaler(c->chrDstW, c->chrXInc, NULL, NULL, NULL, 4);
- 
- #ifdef MAP_ANONYMOUS
--            c->lumMmx2FilterCode = mmap(NULL, c->lumMmx2FilterCodeSize, PROT_READ | PROT_WRITE, MAP_PRIVATE | MAP_ANONYMOUS, 0, 0);
--            c->chrMmx2FilterCode = mmap(NULL, c->chrMmx2FilterCodeSize, PROT_READ | PROT_WRITE, MAP_PRIVATE | MAP_ANONYMOUS, 0, 0);
-+            c->lumMmx2FilterCode = mmap(NULL, c->lumMmx2FilterCodeSize, PROT_READ | PROT_WRITE, MAP_PRIVATE | MAP_ANONYMOUS, -1, 0);
-+            c->chrMmx2FilterCode = mmap(NULL, c->chrMmx2FilterCodeSize, PROT_READ | PROT_WRITE, MAP_PRIVATE | MAP_ANONYMOUS, -1, 0);
- #elif HAVE_VIRTUALALLOC
-             c->lumMmx2FilterCode = VirtualAlloc(NULL, c->lumMmx2FilterCodeSize, MEM_COMMIT, PAGE_EXECUTE_READWRITE);
-             c->chrMmx2FilterCode = VirtualAlloc(NULL, c->chrMmx2FilterCodeSize, MEM_COMMIT, PAGE_EXECUTE_READWRITE);
-@@ -965,7 +965,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
-                 goto fail;
-             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/pkg-plist b/multimedia/ffmpeg/pkg-plist
index 0f7eb3b0cddd..d2d146276172 100644
--- a/multimedia/ffmpeg/pkg-plist
+++ b/multimedia/ffmpeg/pkg-plist
@@ -36,30 +36,52 @@ 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/avcodec.h
 include/libavfilter/avfilter.h
+include/libavfilter/avfiltergraph.h
+include/libavfilter/vsink_buffer.h
+include/libavfilter/vsrc_buffer.h
 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
 include/libavutil/avconfig.h
 include/libavutil/avstring.h
 include/libavutil/avutil.h
 include/libavutil/base64.h
+include/libavutil/bswap.h
 include/libavutil/common.h
 include/libavutil/crc.h
+include/libavutil/cpu.h
+include/libavutil/dict.h
 include/libavutil/error.h
+include/libavutil/eval.h
 include/libavutil/fifo.h
+include/libavutil/file.h
+include/libavutil/imgutils.h
 include/libavutil/intfloat_readwrite.h
+include/libavutil/intreadwrite.h
+include/libavutil/lfg.h
 include/libavutil/log.h
 include/libavutil/lzo.h
 include/libavutil/mathematics.h
 include/libavutil/md5.h
 include/libavutil/mem.h
+include/libavutil/opt.h
+include/libavutil/parseutils.h
 include/libavutil/pixdesc.h
 include/libavutil/pixfmt.h
+include/libavutil/random_seed.h
 include/libavutil/rational.h
+include/libavutil/samplefmt.h
+include/libavutil/sha.h
 include/libavutil/sha1.h
 include/libpostproc/postprocess.h
 include/postproc/postprocess.h
@@ -67,30 +89,30 @@ include/libswscale/swscale.h
 lib/libavcodec.a
 lib/libavcodec.so
 lib/libavcodec.so.1
-lib/libavcodec.so.52.72.2
+lib/libavcodec.so.52.122.0
 lib/libavdevice.a
 lib/libavdevice.so
 lib/libavdevice.so.1
-lib/libavdevice.so.52.2.0
+lib/libavdevice.so.52.5.0
 lib/libavfilter.a
 lib/libavfilter.so
-lib/libavfilter.so.1.19.0
+lib/libavfilter.so.1.80.0
 lib/libavfilter.so.1
 lib/libavformat.a
 lib/libavformat.so
 lib/libavformat.so.1
-lib/libavformat.so.52.64.2
+lib/libavformat.so.52.110.0
 lib/libavutil.a
 lib/libavutil.so
 lib/libavutil.so.1
-lib/libavutil.so.50.15.1
+lib/libavutil.so.50.43.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.11.0
+lib/libswscale.so.0.14.1
 lib/libswscale.so.1
 libdata/pkgconfig/libavcodec.pc
 libdata/pkgconfig/libavdevice.pc
@@ -99,14 +121,12 @@ libdata/pkgconfig/libavformat.pc
 libdata/pkgconfig/libavutil.pc
 libdata/pkgconfig/libpostproc.pc
 libdata/pkgconfig/libswscale.pc
+%%DATADIR%%/libvpx-360p.ffpreset
+%%DATADIR%%/libvpx-720p.ffpreset
+%%DATADIR%%/libvpx-720p50_60.ffpreset
+%%DATADIR%%/libvpx-1080p.ffpreset
+%%DATADIR%%/libvpx-1080p50_60.ffpreset
 %%DATADIR%%/libx264-baseline.ffpreset
-%%DATADIR%%/libx264-default.ffpreset
-%%DATADIR%%/libx264-fast.ffpreset
-%%DATADIR%%/libx264-fast_firstpass.ffpreset
-%%DATADIR%%/libx264-faster.ffpreset
-%%DATADIR%%/libx264-faster_firstpass.ffpreset
-%%DATADIR%%/libx264-fastfirstpass.ffpreset
-%%DATADIR%%/libx264-hq.ffpreset
 %%DATADIR%%/libx264-ipod320.ffpreset
 %%DATADIR%%/libx264-ipod640.ffpreset
 %%DATADIR%%/libx264-lossless_fast.ffpreset
@@ -115,26 +135,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-max.ffpreset
-%%DATADIR%%/libx264-medium.ffpreset
-%%DATADIR%%/libx264-medium_firstpass.ffpreset
-%%DATADIR%%/libx264-normal.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-slowfirstpass.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