14 files changed, 374 insertions, 425 deletions

diff --git a/multimedia/ffmpeg/Makefile b/multimedia/ffmpeg/Makefile
index 0c35249dea10..86ee83ca8c51 100644
--- a/multimedia/ffmpeg/Makefile
+++ b/multimedia/ffmpeg/Makefile
@@ -1,11 +1,8 @@
-# Created by: Mario Sergio Fujikawa Ferreira <lioux@FreeBSD.org>
+# Created by: Martin Matuska <mm@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	ffmpeg
-PORTVERSION=	0.7.15
-PORTREVISION=	2
-PORTEPOCH=	1
-PORTREVISION=	2
+PORTVERSION=	2.0.1
 CATEGORIES=	multimedia audio ipv6 net
 MASTER_SITES=	http://ffmpeg.org/releases/
 
@@ -14,66 +11,207 @@ COMMENT=	Realtime audio/video encoder/converter and streaming server
 
 LICENSE=		GPLv2 LGPL21
 LICENSE_COMB=		multi
-LICENSE_FILE_GPLv2=	${WRKSRC}/COPYING.GPLv2
-LICENSE_FILE_LGPL21=	${WRKSRC}/COPYING.LGPLv2.1
 
 BUILD_DEPENDS=	yasm:${PORTSDIR}/devel/yasm \
 		${LOCALBASE}/bin/as:${PORTSDIR}/devel/binutils \
-		${LOCALBASE}/bin/texi2html:${PORTSDIR}/textproc/texi2html
-
-CONFLICTS=	libav-[0-9]*
-PORTSCOUT=	limit:^0\..*
+		texi2html:${PORTSDIR}/textproc/texi2html
 
 HAS_CONFIGURE=	yes
 CONFIGURE_LOG=	config.err
-USES=		gmake perl5 pkgconfig
+USES=		gmake pkgconfig perl5
+USE_PERL5=	build
 USE_BZIP2=	yes
 WANT_SDL=	yes
-USE_PERL5=	build
 
-OPTIONS_DEFINE=	AACPLUS ALSA AMR_NB AMR_WB CELT DEBUG DIRAC FAAC \
-		FFSERVER FREETYPE FREI0R GSM LAME OPENCV OPENJPEG \
-		OPTIMIZED_CFLAGS RTMP SCHROEDINGER SDL SPEEX THEORA VAAPI \
-		VDPAU VO_AACENC VO_AMRWBENC VORBIS VPX X11GRAB X264 XVID
+OPTIONS_DEFINE=	AACPLUS ALSA AMR_NB AMR_WB ASS CDIO CELT DEBUG FAAC \
+		FDK_AAC FFSERVER FONTCONFIG FREETYPE FREI0R GNUTLS GSM ICONV \
+		LAME LIBBLURAY LIBV4L MODPLUG OPENAL OPENCV OPENJPEG OPENSSL \
+		OPTIMIZED_CFLAGS OPUS PULSEAUDIO RTMP SCHROEDINGER SDL SPEEX \
+		THEORA VAAPI VDPAU VO_AACENC VO_AMRWBENC VORBIS VPX \
+		X11GRAB X264 XVID
 
-OPTIONS_DEFAULT=	FFSERVER FREETYPE FREI0R OPENCV SCHROEDINGER THEORA \
-			VORBIS VPX X264 XVID
+OPTIONS_DEFAULT=	FFSERVER FONTCONFIG FREETYPE FREI0R GNUTLS ICONV \
+			OPENCV SCHROEDINGER THEORA VORBIS VPX X264 XVID
 
+ASS_DESC=	Subtitles rendering via libass
+CDIO_DESC=	Audio CD grabbing with libcdio
+FDK_AAC_DESC=	AAC audio encoding via Fraunhofer FDK
 FFSERVER_DESC=	Build and install ffserver
+LIBV4L_DESC=	Video for Linux support
+OPUS_DESC=	Opus decoding with libopus
 X11GRAB_DESC=	Enable x11 grabbing
 
-COMPAT_HEADERS=libavcodec/avcodec.h \
-	libavcodec/opt.h \
-	libavcodec/vdpau.h \
-	libavcodec/xvmc.h \
-	libavdevice/avdevice.h \
-	libavfilter/avfilter.h \
-	libavformat/avformat.h \
-	libavformat/avio.h \
-	libavutil/adler32.h \
-	libavutil/avstring.h \
-	libavutil/avutil.h \
-	libavutil/base64.h \
-	libavutil/common.h \
-	libavutil/crc.h \
-	libavutil/fifo.h \
-	libavutil/intfloat_readwrite.h \
-	libavutil/log.h \
-	libavutil/lzo.h \
-	libavutil/mathematics.h \
-	libavutil/md5.h \
-	libavutil/mem.h \
-	libavutil/pixfmt.h \
-	libavutil/rational.h \
-	libavutil/sha1.h \
-	libpostproc/postprocess.h \
-	libswscale/swscale.h
+# aacplus
+AACPLUS_LIB_DEPENDS=	libaacplus.so:${PORTSDIR}/audio/libaacplus
+AACPLUS_CONFIGURE_ENABLE=	libaacplus
 
-.include <bsd.port.options.mk>
+# alsa
+ALSA_CONFIGURE_OFF=	--disable-indev=alsa \
+			--disable-outdev=alsa
+ALSA_LIB_DEPENDS=	libasound.so:${PORTSDIR}/audio/alsa-lib
+
+# Opencore AMR NB
+AMR_NB_LIB_DEPENDS=	libopencore-amrnb.so:${PORTSDIR}/audio/opencore-amr
+AMR_NB_CONFIGURE_ENABLE=	libopencore-amrnb
+
+# Opencore AMR WB
+AMR_WB_LIB_DEPENDS=	libopencore-amrwb.so:${PORTSDIR}/audio/opencore-amr
+AMR_WB_CONFIGURE_ENABLE=	libopencore-amrwb
+
+# ass
+ASS_LIB_DEPENDS=	libass.so:${PORTSDIR}/multimedia/libass
+ASS_CONFIGURE_ENABLE=	libass
+
+# cdio
+CDIO_LIB_DEPENDS=	libcdio.so:${PORTSDIR}/sysutils/libcdio
+CDIO_CONFIGURE_ENABLE=	libcdio
+
+# celt
+CELT_LIB_DEPENDS=	libcelt0.so:${PORTSDIR}/audio/celt
+CELT_CONFIGURE_ENABLE=	libcelt
+
+# faac
+FAAC_LIB_DEPENDS=	libfaac.so:${PORTSDIR}/audio/faac
+FAAC_CONFIGURE_ENABLE=	libfaac
+
+# fdk_aac
+FDK_AAC_LIB_DEPENDS=	libfdk-aac.so:${PORTSDIR}/audio/fdk-aac
+FDK_AAC_CONFIGURE_ENABLE=	libfdk-aac
+
+# ffserver
+FFSERVER_CONFIGURE_ENABLE=	ffserver
+
+# fontconfig
+FONTCONFIG_LIB_DEPENDS=	libfontconfig.so:${PORTSDIR}/x11-fonts/fontconfig
+FONTCONFIG_CONFIGURE_ENABLE=	fontconfig
+
+# freetype
+FREETYPE_LIB_DEPENDS=	libfreetype.so:${PORTSDIR}/print/freetype2
+FREETYPE_CONFIGURE_ENABLE=	libfreetype
+
+# frei0r
+FREI0R_BUILD_DEPENDS=	${LOCALBASE}/include/frei0r.h:${PORTSDIR}/graphics/frei0r
+FREI0R_CONFIGURE_ENABLE=	frei0r
+
+# gnutls
+GNUTLS_LIB_DEPENDS=	libgnutls.so:${PORTSDIR}/security/gnutls
+GNUTLS_CONFIGURE_ENABLE=	gnutls
+
+# gsm
+GSM_LIB_DEPENDS=	libgsm.so:${PORTSDIR}/audio/gsm
+GSM_CONFIGURE_ENABLE=	libgsm
+
+# iconv
+ICONV_USES=	iconv
+ICONV_CONFIGURE_ENABLE=	iconv
+
+# lame
+LAME_LIB_DEPENDS=	libmp3lame.so:${PORTSDIR}/audio/lame
+LAME_CONFIGURE_ENABLE=	libmp3lame
+
+# libbluray
+LIBBLURAY_LIB_DEPENDS=	libbluray.so:${PORTSDIR}/multimedia/libbluray
+LIBBLURAY_CONFIGURE_ENABLE=	libbluray
+
+# libv4l
+LIBV4L_LIB_DEPENDS=	libv4l2.so:${PORTSDIR}/multimedia/libv4l
+LIBV4L_CONFIGURE_ENABLE=	libv4l2
+
+# modplug
+MODPLUG_LIB_DEPENDS=	libmodplug.so:${PORTSDIR}/audio/libmodplug
+MODPLUG_CONFIGURE_ENABLE=	libmodplug
+
+# OpenAL
+OPENAL_LIB_DEPENDS=	libopenal.so:${PORTSDIR}/audio/openal-soft
+OPENAL_CONFIGURE_ENABLE=	openal
+
+# opencv
+OPENCV_LIB_DEPENDS=	libopencv_imgproc.so:${PORTSDIR}/graphics/opencv-core
+OPENCV_CONFIGURE_ENABLE=	libopencv
+
+# openjpeg
+OPENJPEG_LIB_DEPENDS=	libopenjpeg.so:${PORTSDIR}/graphics/openjpeg
+OPENJPEG_CONFIGURE_ENABLE=	libopenjpeg
+
+# opus
+OPUS_LIB_DEPENDS=	libopus.so:${PORTSDIR}/audio/opus
+OPUS_CONFIGURE_ENABLE=	libopus
+
+# pulseaudio
+PULSEAUDIO_LIB_DEPENDS=	libpulse.so:${PORTSDIR}/audio/pulseaudio
+PULSEAUDIO_CONFIGURE_ENABLE=	libpulse
 
 # rtmp
-.if ${PORT_OPTIONS:MRTMP}
+RTMP_LIB_DEPENDS=	librtmp.so:${PORTSDIR}/multimedia/rtmpdump
+RTMP_CONFIGURE_ENABLE=	librtmp
+
+# schroedinger
+SCHROEDINGER_LIB_DEPENDS=	libschroedinger-1.0.so:${PORTSDIR}/multimedia/schroedinger
+SCHROEDINGER_CONFIGURE_ENABLE=	libschroedinger
+
+# speex
+SPEEX_LIB_DEPENDS=	libspeex.so:${PORTSDIR}/audio/speex
+SPEEX_CONFIGURE_ENABLE=	libspeex
+
+# theora
+THEORA_LIB_DEPENDS=	libtheora.so:${PORTSDIR}/multimedia/libtheora
+THEORA_CONFIGURE_ENABLE=	libtheora
+
+# vaapi
+VAAPI_LIB_DEPENDS=	libva.so:${PORTSDIR}/multimedia/libva
+VAAPI_CONFIGURE_ENABLE=	vaapi
+
+# vdpau
+VDPAU_BUILD_DEPENDS=	${LOCALBASE}/include/vdpau/vdpau.h:${PORTSDIR}/multimedia/libvdpau
+VDPAU_CONFIGURE_ENABLE=	vdpau
+
+# vo-aacenc
+VO_AACENC_LIB_DEPENDS=	libvo-aacenc.so:${PORTSDIR}/audio/vo-aacenc
+VO_AACENC_CONFIGURE_ENABLE=	libvo-aacenc
+
+# vo-amrwbenc
+VO_AMRWBENC_LIB_DEPENDS=	libvo-amrwbenc.so:${PORTSDIR}/audio/vo-amrwbenc
+VO_AMRWBENC_CONFIGURE_ENABLE=	libvo-amrwbenc
+
+# vorbis
+VORBIS_LIB_DEPENDS=	libvorbisenc.so:${PORTSDIR}/audio/libvorbis
+VORBIS_CONFIGURE_ENABLE=	libvorbis
+
+# vp8
+VPX_LIB_DEPENDS=	libvpx.so:${PORTSDIR}/multimedia/libvpx
+VPX_CONFIGURE_ENABLE=	libvpx
+
+# x264
+X264_LIB_DEPENDS=	libx264.so:${PORTSDIR}/multimedia/x264
+X264_CONFIGURE_ENABLE=	libx264
+
+# xvid
+XVID_LIB_DEPENDS=	libxvidcore.so:${PORTSDIR}/multimedia/xvid
+XVID_CONFIGURE_ENABLE=	libxvid
+
+FFPROGS=	ffmpeg ffprobe
+INSTALL_TARGET=	install-progs install-data install-libs install-headers
+#FFMPEG_SUFFIX=	2
+#PLIST_SUB+=	SUFF="${FFMPEG_SUFFIX}"
+
+#USE_LDCONFIG=	${PREFIX}/lib/ffmpeg${FFMPEG_SUFFIX}
+DATADIR=	${PREFIX}/share/${PORTNAME}${PKGNAMESUFFIX}
+
+.include <bsd.port.options.mk>
+
+# ssl
+.if ${PORT_OPTIONS:MOPENSSL} && empty(PORT_OPTIONS:MGNUTLS)
 USE_OPENSSL=	yes
+FFMPEG_NONFREE=	yes
+.endif
+
+.if ${PORT_OPTIONS:MAACPLUS} || ${PORT_OPTIONS:MFAAC} || ${PORT_OPTIONS:MFDK_AAC}
+FFMPEG_NONFREE=	yes
+.endif
+
+.if ${PORT_OPTIONS:MAMR_NB} || ${PORT_OPTIONS:MAMR_WB} || \
+${PORT_OPTIONS:MVO_AACENC} || ${PORT_OPTIONS:MVO_AMRWBENC}
+FFMPEG_LICENSE_GPL3=	yes
 .endif
 
 # x11grab
@@ -84,29 +222,32 @@ CONFIGURE_ARGS+=	--enable-x11grab
 
 .include <bsd.port.pre.mk>
 
+DATADIR=	${PREFIX}/share/${PORTNAME}${PKGNAMESUFFIX}
+DOCSDIR=	${PREFIX}/share/doc/${PORTNAME}${PKGNAMESUFFIX}
 CONFIGURE_ENV+=	COMPILER_PATH=${LOCALBASE}/bin
 MAKE_ENV+=	COMPILER_PATH=${LOCALBASE}/bin
 
 CONFIGURE_ARGS+=--prefix="${PREFIX}" \
 		--mandir="${PREFIX}/man" \
+		--datadir="${DATADIR}" \
 		--enable-shared \
 		--enable-gpl \
 		--enable-postproc \
 		--enable-avfilter \
+		--enable-avresample \
 		--enable-pthreads \
 		--enable-memalign-hack \
-		--enable-runtime-cpudetect \
+		--disable-libstagefright-h264 \
+		--disable-libutvideo \
+		--disable-libsoxr \
 		--cc="${CC}" \
 		--extra-cflags="${FFMPEG_CFLAGS} -I${LOCALBASE}/include" \
 		--extra-ldflags="-L${LOCALBASE}/lib ${FFMPEG_LDFLAGS}" \
 		--extra-libs="${PTHREAD_LIBS}"
-SHLIB_VER=	1
-PLIST_SUB=	SHLIB_VER=${SHLIB_VER}
-USE_LDCONFIG=	yes
 
-DOC_FILES=	CREDITS INSTALL LICENSE MAINTAINERS README RELEASE
+DOC_FILES=	Changelog CREDITS INSTALL LICENSE MAINTAINERS README
 # under doc subdirectory
-DOC_DOCFILES=	APIchanges RELEASE_NOTES TODO *.txt *.html
+DOC_DOCFILES=	APIchanges RELEASE_NOTES *.txt *.html
 PORTDOCS=	*
 
 .if ${PORT_OPTIONS:MDEBUG}
@@ -134,7 +275,7 @@ _NO_BUILTIN_VECTOR=	yes
 
 # builtin vector, requires mmx and sse
 .if !defined(_NO_BUILTIN_VECTOR) && defined(_BUILTIN_VECTOR)
-CFLAGS+=	-msse
+FFMPEG_CFLAGS+=		-msse
 .endif
 
 # optimizations
@@ -142,232 +283,33 @@ CFLAGS+=	-msse
 CFLAGS+=	-O3 -ffast-math -fno-finite-math-only -fomit-frame-pointer
 .endif
 
-#aacplus
-.if ${PORT_OPTIONS:MAACPLUS}
-FFMPEG_NONFREE=	yes
-LIB_DEPENDS+=	aacplus.2:${PORTSDIR}/audio/libaacplus
-CONFIGURE_ARGS+=	--enable-libaacplus
-.else
-CONFIGURE_ARGS+=	--disable-libaacplus
-.endif
-
-#alsa
-.if ${PORT_OPTIONS:MALSA}
-LIB_DEPENDS+=	asound.2:${PORTSDIR}/audio/alsa-lib
-.else
-CONFIGURE_ARGS+=	--disable-indev=alsa \
-			--disable-outdev=alsa
-.endif
-
-# Opencore AMR NB
-.if ${PORT_OPTIONS:MAMR_NB}
-FFMPEG_LICENSE_GPL3=	yes
-LIB_DEPENDS+=	opencore-amrnb.0:${PORTSDIR}/audio/opencore-amr
-CONFIGURE_ARGS+=	--enable-libopencore-amrnb
-.else
-CONFIGURE_ARGS+=	--disable-libopencore-amrnb
-.endif
-
-# Opencore AMR WB
-.if ${PORT_OPTIONS:MAMR_WB}
-FFMPEG_LICENSE_GPL3=	yes
-LIB_DEPENDS+=	opencore-amrwb.0:${PORTSDIR}/audio/opencore-amr
-CONFIGURE_ARGS+=	--enable-libopencore-amrwb
-.else
-CONFIGURE_ARGS+=	--disable-libopencore-amrwb
-.endif
-
-# celt
-.if ${PORT_OPTIONS:MCELT}
-LIB_DEPENDS+=	celt0.2:${PORTSDIR}/audio/celt
-CONFIGURE_ARGS+=	--enable-libcelt
-.else
-CONFIGURE_ARGS+=	--disable-libcelt
-.endif
-
-# dirac
-.if ${PORT_OPTIONS:MDIRAC}
-LIB_DEPENDS+=	dirac_encoder.1:${PORTSDIR}/multimedia/dirac
-CONFIGURE_ARGS+=	--enable-libdirac
-.else
-CONFIGURE_ARGS+=	--disable-libdirac
-.endif
-
-# faac
-.if ${PORT_OPTIONS:MFAAC}
-FFMPEG_NONFREE=	yes
-LIB_DEPENDS+=	faac.0:${PORTSDIR}/audio/faac
-CONFIGURE_ARGS+=	--enable-libfaac
-.else
-CONFIGURE_ARGS+=	--disable-libfaac
-.endif
-
 # ffserver
 .if ${PORT_OPTIONS:MFFSERVER}
 PLIST_SUB+=	FFSERVER=""
-.else
-PLIST_SUB+=	FFSERVER="@comment "
-CONFIGURE_ARGS+=	--disable-ffserver
-.endif
-
-# freetype
-.if ${PORT_OPTIONS:MFREETYPE}
-LIB_DEPENDS+=	freetype.9:${PORTSDIR}/print/freetype2
-CONFIGURE_ARGS+=	--enable-libfreetype
-.else
-CONFIGURE_ARGS+=	--disable-libfreetype
-.endif
-
-# frei0r
-.if ${PORT_OPTIONS:MFREI0R}
-BUILD_DEPENDS+=	${LOCALBASE}/include/frei0r.h:${PORTSDIR}/graphics/frei0r
-CONFIGURE_ARGS+=	--enable-frei0r
-.else
-CONFIGURE_ARGS+=	--disable-frei0r
-.endif
-
-# gsm
-.if ${PORT_OPTIONS:MGSM}
-LIB_DEPENDS+=	gsm.1:${PORTSDIR}/audio/gsm
-CONFIGURE_ARGS+=	--enable-libgsm
-.else
-CONFIGURE_ARGS+=	--disable-libgsm
-.endif
-
-# mp3
-.if ${PORT_OPTIONS:MLAME}
-LIB_DEPENDS+=	mp3lame.0:${PORTSDIR}/audio/lame
-CONFIGURE_ARGS+=	--enable-libmp3lame
-.else
-CONFIGURE_ARGS+=	--disable-libmp3lame
-.endif
-
-# opencv
-.if ${PORT_OPTIONS:MOPENCV}
-LIB_DEPENDS+=	opencv_imgproc.2:${PORTSDIR}/graphics/opencv-core
-CONFIGURE_ARGS+=	--enable-libopencv
-.else
-CONFIGURE_ARGS+=	--disable-libopencv
-.endif
-
-# openjpeg
-.if ${PORT_OPTIONS:MOPENJPEG}
-LIB_DEPENDS+=	openjpeg.2:${PORTSDIR}/graphics/openjpeg
-CONFIGURE_ARGS+=	--enable-libopenjpeg
-.else
-CONFIGURE_ARGS+=	--disable-libopenjpeg
-.endif
-
-# rtmp
-.if ${PORT_OPTIONS:MRTMP}
-LIB_DEPENDS+=	rtmp.0:${PORTSDIR}/multimedia/rtmpdump
-CONFIGURE_ARGS+=	--enable-librtmp
-. if ${OPENSSLBASE} != "/usr"
-FFMPEG_CFLAGS+=		-I${OPENSSLINC}
-FFMPEG_LDFLAGS+=	-L${OPENSSLLIB}
+PLIST_FILES+=	man/man1/ffserver.1.gz
+FFPROGS+=	ffserver
+. if ${PORT_OPTIONS:MDOCS}
+DOC_DOCFILES+=	ffserver.html
 . endif
 .else
-CONFIGURE_ARGS+=	--disable-librtmp
-.endif
-
-# schroedinger
-.if ${PORT_OPTIONS:MSCHROEDINGER}
-LIB_DEPENDS+=	schroedinger-1.0.11:${PORTSDIR}/multimedia/schroedinger
-CONFIGURE_ARGS+=	--enable-libschroedinger
-.else
-CONFIGURE_ARGS+=	--disable-libschroedinger
+PLIST_SUB+=	FFSERVER="@comment "
 .endif
 
 # sdl
 .if ${PORT_OPTIONS:MSDL}
 USE_SDL+=	sdl
 PLIST_FILES+=	bin/ffplay man/man1/ffplay.1.gz
-.else
-CONFIGURE_ARGS+=	--disable-ffplay
-.endif
-
-# speex
-.if ${PORT_OPTIONS:MSPEEX}
-LIB_DEPENDS+=	speex.1:${PORTSDIR}/audio/speex
-CONFIGURE_ARGS+=	--enable-libspeex
-.else
-CONFIGURE_ARGS+=	--disable-libspeex
-.endif
-
-# theora
-.if ${PORT_OPTIONS:MTHEORA}
-LIB_DEPENDS+=	theora.0:${PORTSDIR}/multimedia/libtheora
-CONFIGURE_ARGS+=	--enable-libtheora
-.else
-CONFIGURE_ARGS+=	--disable-libtheora
+FFPROGS+=	ffplay
+.if ${PORT_OPTIONS:MDOCS}
+DOC_DOCFILES+=	ffplay.html
 .endif
-
-# vaapi
-.if ${PORT_OPTIONS:MVAAPI}
-FFMPEG_LICENSE_GPL3=	yes
-LIB_DEPENDS+=	va.1:${PORTSDIR}/multimedia/libva
-CONFIGURE_ARGS+=	--enable-vaapi
 .else
-CONFIGURE_ARGS+=	--disable-vaapi
-.endif
-
-# vdpau
-.if ${PORT_OPTIONS:MVDPAU}
-BUILD_DEPENDS+=	${LOCALBASE}/include/vdpau/vdpau.h:${PORTSDIR}/multimedia/libvdpau
-CONFIGURE_ARGS+=	--enable-vdpau
-.else
-CONFIGURE_ARGS+=	--disable-vdpau
-.endif
-
-# vo-aacenc
-.if ${PORT_OPTIONS:MVO_AACENC}
-FFMPEG_LICENSE_GPL3=	yes
-LIB_DEPENDS+=	vo-aacenc.0:${PORTSDIR}/audio/vo-aacenc
-CONFIGURE_ARGS+=	--enable-libvo-aacenc
-.else
-CONFIGURE_ARGS+=	--disable-libvo-aacenc
-.endif
-
-# vo-amrwbenc
-.if ${PORT_OPTIONS:MVO_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
+CONFIGURE_ARGS+=	--disable-ffplay
 .endif
 
 # vorbis
 .if ${PORT_OPTIONS:MVORBIS}
-LIB_DEPENDS+=	vorbisenc.2:${PORTSDIR}/audio/libvorbis
-CONFIGURE_ARGS+=	--enable-libvorbis
 FFMPEG_CFLAGS+=		-I${LOCALBASE}/include/vorbis
-.else
-CONFIGURE_ARGS+=	--disable-libvorbis
-.endif
-
-# vp8
-.if ${PORT_OPTIONS:MVPX}
-LIB_DEPENDS+=	vpx.1:${PORTSDIR}/multimedia/libvpx
-CONFIGURE_ARGS+=	--enable-libvpx
-.else
-CONFIGURE_ARGS+=	--disable-libvpx
-.endif
-
-# x264
-.if ${PORT_OPTIONS:MX264}
-LIB_DEPENDS+=	x264:${PORTSDIR}/multimedia/x264
-CONFIGURE_ARGS+=	--enable-libx264
-.else
-CONFIGURE_ARGS+=	--disable-libx264
-.endif
-
-# xvid
-.if ${PORT_OPTIONS:MXVID}
-LIB_DEPENDS+=	xvidcore.4:${PORTSDIR}/multimedia/xvid
-CONFIGURE_ARGS+=	--enable-libxvid
-.else
-CONFIGURE_ARGS+=	--disable-libxvid
 .endif
 
 # License knobs
@@ -377,16 +319,16 @@ CONFIGURE_ARGS+=	--enable-nonfree
 .endif
 
 .if defined(FFMPEG_LICENSE_GPL3)
-LICENSE+=		GPLv3 LGPL3
+CONFIGURE_ARGS+=	--enable-version3
+LICENSE=		GPLv3 LGPL3
 LICENSE_FILE_GPLv3=	${WRKSRC}/COPYING.GPLv3
 LICENSE_FILE_LGPL3=	${WRKSRC}/COPYING.LGPLv3
-CONFIGURE_ARGS+=	--enable-version3
 .endif
 
 post-patch:
 # {C,LD}FLAGS safeness
 	@${REINPLACE_CMD} -e 's|$$(LIBDIR)/pkgconfig|$$(DESTDIR)$$(prefix)/libdata/pkgconfig|' \
-		${WRKSRC}/subdir.mak
+		${WRKSRC}/library.mak
 	@${REINPLACE_CMD} -e 's|/etc/ffserver.conf|${PREFIX}/etc/ffserver.conf|' \
 		${WRKSRC}/ffserver.c
 	@${REINPLACE_CMD} -E \
@@ -395,12 +337,12 @@ post-patch:
 		s|-pthread|${PTHREAD_LIBS}|g; \
 		s|gsm/gsm.h|gsm.h|g" \
 		${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT}
-	@${REINPLACE_CMD} -e 's|-ldl||; s|$$(LIBMAJOR)|${SHLIB_VER}|g;' \
+	@${REINPLACE_CMD} -e 's|-ldl||' \
 		-e 's|opencv opencv/cxcore.h|opencv-core opencv2/core/core_c.h|g' \
 		${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT}
 	@${REINPLACE_CMD} -e 's|/usr/bin/perl|${PERL5}|g' \
 		${WRKSRC}/doc/texi2pod.pl
-.if ${PORT_OPTIONS:MDSL}
+.if ${PORT_OPTIONS:MSDL}
 	@${REINPLACE_CMD} -E \
 		-e 's|sdl-config|${SDL_CONFIG}|g' \
 		${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT}
@@ -417,8 +359,13 @@ post-configure:
 .endif
 
 post-install:
+.for PROG in ${FFPROGS}
+	@${MKDIR} ${STAGEDIR}${MAN1PREFIX}/man/man1
+	${INSTALL_MAN} ${WRKSRC}/doc/${PROG}.1 ${STAGEDIR}${MAN1PREFIX}/man/man1/${PROG}.1
+.endfor
 .if ${PORT_OPTIONS:MFFSERVER}
-	${INSTALL_DATA} ${WRKSRC}/doc/ffserver.conf ${STAGEDIR}${PREFIX}/etc/ffserver.conf-dist
+	${INSTALL_DATA} ${WRKSRC}/doc/ffserver.conf \
+		${STAGEDIR}${PREFIX}/etc/ffserver.conf-dist
 .endif
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 .for FILE in ${DOC_FILES}
@@ -427,12 +374,5 @@ post-install:
 .for FILE in ${DOC_DOCFILES}
 	${INSTALL_DATA} ${WRKSRC}/doc/${FILE} ${STAGEDIR}${DOCSDIR}
 .endfor
-	@${MKDIR} ${STAGEDIR}${PREFIX}/include/ffmpeg
-.for FILE in ${COMPAT_HEADERS}
-	${LN} -sf ../${FILE} ${STAGEDIR}${PREFIX}/include/ffmpeg/${FILE:C,^[^/]+/([^/]+).*,\1,}
-.endfor
-	@${MKDIR} ${STAGEDIR}${PREFIX}/include/postproc
-	${LN} -sf ../libpostproc/postprocess.h \
-		 ${STAGEDIR}${PREFIX}/include/postproc/postprocess.h
 
 .include <bsd.port.post.mk>
diff --git a/multimedia/ffmpeg/distinfo b/multimedia/ffmpeg/distinfo
index 600a5b12f994..a82fa0b63503 100644
--- a/multimedia/ffmpeg/distinfo
+++ b/multimedia/ffmpeg/distinfo
@@ -1,2 +1,2 @@
-SHA256 (ffmpeg-0.7.15.tar.bz2) = c5145aab922076b9986168214c9bd607f4664644f14f9074499fc52a039fcfd9
-SIZE (ffmpeg-0.7.15.tar.bz2) = 4528584
+SHA256 (ffmpeg-2.0.1.tar.bz2) = 611eae7e3485d5fd9ff03e0ac7575ea89bc8105e40e99a40de02324957482f95
+SIZE (ffmpeg-2.0.1.tar.bz2) = 6187933
diff --git a/multimedia/ffmpeg/files/patch-Makefile b/multimedia/ffmpeg/files/patch-Makefile
new file mode 100644
index 000000000000..ccbef27e5dd8
--- /dev/null
+++ b/multimedia/ffmpeg/files/patch-Makefile
@@ -0,0 +1,11 @@
+--- Makefile.orig	2012-05-04 12:24:34.447846798 +0200
++++ Makefile	2012-05-04 12:24:42.471850113 +0200
+@@ -79,7 +79,7 @@
+ $(foreach V,$(SUBDIR_VARS),$(eval $(call RESET,$(V))))
+ SUBDIR := $(1)/
+ include $(SRC_PATH)/$(1)/Makefile
+--include $(SRC_PATH)/$(1)/$(ARCH)/Makefile
++-include $(SRC_PATH)/$(1)/$(FFMPEG_ARCH)/Makefile
+ include $(SRC_PATH)/library.mak
+ endef
+ 
diff --git a/multimedia/ffmpeg/files/patch-configure b/multimedia/ffmpeg/files/patch-configure
index 5e0f7e987e47..e827011a9af8 100644
--- a/multimedia/ffmpeg/files/patch-configure
+++ b/multimedia/ffmpeg/files/patch-configure
@@ -1,7 +1,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'
+--- configure.orig
++++ configure
+@@ -2147,7 +2147,7 @@ yasmexe_default="yasm"
+ nogas=":"
  
  # machine
 -arch_default=$(uname -m)
@@ -9,23 +9,49 @@
  cpu="generic"
  
  # OS
-@@ -2966,8 +2966,8 @@
- texi2html -version > /dev/null 2>&1 && enable texi2html || disable texi2html
+@@ -3991,10 +3991,10 @@ perl --version > /dev/null 2>&1 && enabl
+ pod2man --help > /dev/null 2>&1 && enable pod2man || disable pod2man
+ rsync --help 2> /dev/null | grep -q 'contimeout' && enable rsync_contimeout || disable rsync_contimeout
  
- check_header linux/fb.h
+-check_header linux/fb.h
 -check_header linux/videodev.h
 -check_header linux/videodev2.h
+-check_code cc linux/videodev2.h "struct v4l2_frmsizeenum vfse; vfse.discrete.width = 0;" && enable_safe struct_v4l2_frmivalenum_discrete
++#check_header linux/fb.h
 +#check_header linux/videodev.h
 +#check_header linux/videodev2.h
++#check_code cc linux/videodev2.h "struct v4l2_frmsizeenum vfse; vfse.discrete.width = 0;" && enable_safe struct_v4l2_frmivalenum_discrete
+ 
  check_header sys/videoio.h
  
- check_func_headers "windows.h vfw.h" capCreateCaptureWindow "$vfwcap_indev_extralibs"
-@@ -3322,7 +3322,7 @@
- SRC_PATH="$source_path"
- SRC_PATH_BARE=$source_path
+@@ -4373,7 +4373,7 @@ ifndef MAIN_MAKEFILE
+ SRC_PATH:=\$(SRC_PATH:.%=..%)
+ endif
  CC_IDENT=$cc_ident
 -ARCH=$arch
 +FFMPEG_ARCH=$arch
  CC=$cc
+ CXX=$cxx
  AS=$as
- LD=$ld
+@@ -4555,7 +4555,7 @@ exec_prefix=\${prefix}
+ libdir=$libdir
+ includedir=$incdir
+ 
+-Name: $name
++Name: ${name}${build_suffix}
+ Description: $comment
+ Version: $version
+ Requires: $(enabled shared || echo $requires)
+@@ -4569,10 +4569,10 @@ EOF
+ mkdir -p doc/examples/pc-uninstalled
+ includedir=${source_path}
+ [ "$includedir" = . ] && includedir="\${pcfiledir}/../../.."
+-    cat <<EOF > doc/examples/pc-uninstalled/$name.pc
++    cat <<EOF > doc/examples/pc-uninstalled/${name}${build_suffix}.pc
+ prefix=
+ exec_prefix=
+-libdir=\${pcfiledir}/../../../$name
++libdir=\${pcfiledir}/../../../${name}${build_suffix}
+ includedir=${includedir}
+ 
+ Name: $name
diff --git a/multimedia/ffmpeg/files/patch-doc-Makefile b/multimedia/ffmpeg/files/patch-doc-Makefile
new file mode 100644
index 000000000000..4b702775a360
--- /dev/null
+++ b/multimedia/ffmpeg/files/patch-doc-Makefile
@@ -0,0 +1,11 @@
+--- doc/Makefile.orig	2012-09-28 03:37:35.000000000 +0200
++++ doc/Makefile	2012-10-12 21:36:56.461440175 +0200
+@@ -57,7 +57,7 @@
+ install-man:
+ 
+ ifdef CONFIG_MANPAGES
+-install-progs-$(CONFIG_DOC): install-man
++#install-progs-$(CONFIG_DOC): install-man
+ 
+ install-man: $(MANPAGES)
+ 	$(Q)mkdir -p "$(MANDIR)/man1"
diff --git a/multimedia/ffmpeg/files/patch-doc-protocols.texi b/multimedia/ffmpeg/files/patch-doc-protocols.texi
deleted file mode 100644
index 1e078d04a96f..000000000000
--- a/multimedia/ffmpeg/files/patch-doc-protocols.texi
+++ /dev/null
@@ -1,13 +0,0 @@
---- doc/protocols.texi.orig	2013-02-17 14:46:23.000000000 -0800
-+++ doc/protocols.texi	2013-10-08 12:00:38.375693236 -0700
-@@ -155,8 +155,8 @@
- 
- Real-Time Messaging Protocol.
- 
--The Real-Time Messaging Protocol (RTMP) is used for streaming multime‐
--dia content across a TCP/IP network.
-+The Real-Time Messaging Protocol (RTMP) is used for streaming multimedia
-+content across a TCP/IP network.
- 
- The required syntax is:
- @example
diff --git a/multimedia/ffmpeg/files/patch-libavcodec-Makefile b/multimedia/ffmpeg/files/patch-libavcodec-Makefile
index bfc359cff690..0e64d96791f5 100644
--- a/multimedia/ffmpeg/files/patch-libavcodec-Makefile
+++ b/multimedia/ffmpeg/files/patch-libavcodec-Makefile
@@ -1,11 +1,11 @@
---- libavcodec/Makefile.orig	2010-08-01 20:33:53.484907333 +0200
-+++ libavcodec/Makefile	2010-08-01 20:34:26.190893400 +0200
-@@ -590,7 +590,7 @@
+--- libavcodec/Makefile.orig	2012-08-06 10:06:26.000000000 +0200
++++ libavcodec/Makefile	2012-08-06 10:36:33.478505808 +0200
+@@ -793,7 +793,7 @@
+                                           codec_names.h                 \
+                                           fft-internal.h                \
+                                           tableprint.h                  \
+-                                          $(ARCH)/vp56_arith.h          \
++                                          $(FFMPEG_ARCH)/vp56_arith.h   \
  
- OBJS-$(CONFIG_MLIB)                    += mlib/dsputil_mlib.o           \
- 
---include $(SUBDIR)$(ARCH)/Makefile
-+-include $(SUBDIR)$(FFMPEG_ARCH)/Makefile
- 
- SKIPHEADERS                             = %_tablegen.h
  SKIPHEADERS-$(CONFIG_DXVA2)            += dxva2.h dxva2_internal.h
+ SKIPHEADERS-$(CONFIG_LIBSCHROEDINGER)  += libschroedinger.h
diff --git a/multimedia/ffmpeg/files/patch-libavcodec-libgsm.c b/multimedia/ffmpeg/files/patch-libavcodec-libgsm.c
deleted file mode 100644
index 62f52c8206fe..000000000000
--- a/multimedia/ffmpeg/files/patch-libavcodec-libgsm.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- libavcodec/libgsm.c.orig	2010-07-21 10:24:16.297810379 +0200
-+++ libavcodec/libgsm.c	2010-07-21 10:24:22.915234561 +0200
-@@ -28,7 +28,7 @@
- // The idiosyncrasies of GSM-in-WAV are explained at http://kbs.cs.tu-berlin.de/~jutta/toast.html
- 
- #include "avcodec.h"
--#include <gsm/gsm.h>
-+#include <gsm.h>
- 
- // gsm.h misses some essential constants
- #define GSM_BLOCK_SIZE 33
diff --git a/multimedia/ffmpeg/files/patch-libavdevice-bktr.c b/multimedia/ffmpeg/files/patch-libavdevice-bktr.c
index 541775966313..c64d1826eb91 100644
--- a/multimedia/ffmpeg/files/patch-libavdevice-bktr.c
+++ b/multimedia/ffmpeg/files/patch-libavdevice-bktr.c
@@ -1,14 +1,14 @@
---- libavdevice/bktr.c.orig	2011-06-21 21:29:25.000000000 +0200
-+++ libavdevice/bktr.c	2011-06-23 13:39:44.160881669 +0200
+--- libavdevice/bktr.c.orig	2012-01-22 14:41:15.000000000 +0100
++++ libavdevice/bktr.c	2012-01-22 16:07:07.873280412 +0100
 @@ -24,6 +24,11 @@
   * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
   */
  
-+typedef unsigned char	u_char;
-+typedef unsigned short	u_short;
-+typedef unsigned int	u_int;
-+typedef unsigned long	u_long;
++typedef unsigned char u_char;
++typedef unsigned short        u_short;
++typedef unsigned int  u_int;
++typedef unsigned long u_long;
 +
+ #include "libavformat/internal.h"
  #include "libavutil/log.h"
  #include "libavutil/opt.h"
- #include "libavutil/parseutils.h"
diff --git a/multimedia/ffmpeg/files/patch-libavfilter-Makefile b/multimedia/ffmpeg/files/patch-libavfilter-Makefile
deleted file mode 100644
index be35a25555cf..000000000000
--- a/multimedia/ffmpeg/files/patch-libavfilter-Makefile
+++ /dev/null
@@ -1,11 +0,0 @@
---- libavfilter/Makefile.orig	2011-06-23 16:22:46.163337772 +0200
-+++ libavfilter/Makefile	2011-06-23 16:22:53.731245405 +0200
-@@ -136,7 +136,7 @@
- OBJS-$(CONFIG_MP_FILTER) += libmpcodecs/pullup.o
- 
- 
---include $(SUBDIR)$(ARCH)/Makefile
-+-include $(SUBDIR)$(FFMPEG_ARCH)/Makefile
- 
- DIRS = x86 libmpcodecs
- 
diff --git a/multimedia/ffmpeg/files/patch-libavfilter-vf_libopencv.c b/multimedia/ffmpeg/files/patch-libavfilter-vf_libopencv.c
index 28cccd3cb5bf..ded99fa94ac4 100644
--- a/multimedia/ffmpeg/files/patch-libavfilter-vf_libopencv.c
+++ b/multimedia/ffmpeg/files/patch-libavfilter-vf_libopencv.c
@@ -1,5 +1,5 @@
---- libavfilter/vf_libopencv.c.orig	2011-06-27 21:27:01.521012341 +0200
-+++ libavfilter/vf_libopencv.c	2011-06-27 21:27:16.839540294 +0200
+--- libavfilter/vf_libopencv.c.orig	2012-08-05 14:09:37.882506740 +0200
++++ libavfilter/vf_libopencv.c	2012-08-05 14:10:24.508510133 +0200
 @@ -25,8 +25,7 @@
  
  /* #define DEBUG */
diff --git a/multimedia/ffmpeg/files/patch-libavutil-common.h b/multimedia/ffmpeg/files/patch-libavutil-common.h
index 9bb629bc0ab8..e4a38622d92e 100644
--- a/multimedia/ffmpeg/files/patch-libavutil-common.h
+++ b/multimedia/ffmpeg/files/patch-libavutil-common.h
@@ -1,11 +1,11 @@
---- libavutil/common.h.orig	2010-04-26 23:01:38.000000000 +0200
-+++ libavutil/common.h	2010-07-10 16:06:27.038027901 +0200
+--- libavutil/common.h.orig	2010-07-07 19:27:45.000000000 +0200
++++ libavutil/common.h	2010-08-01 22:27:42.964629491 +0200
 @@ -36,6 +36,10 @@
  #include <string.h>
  #include "attributes.h"
  
 +#ifndef	UINT64_C
-+#define	UINT64_C(c)		(c ## UL)
++#define	UINT64_C(c)	(c ## UL)
 +#endif
 +
  //rounded division & shift
diff --git a/multimedia/ffmpeg/pkg-descr b/multimedia/ffmpeg/pkg-descr
index a57c13b8945e..75f1916e4e02 100644
--- a/multimedia/ffmpeg/pkg-descr
+++ b/multimedia/ffmpeg/pkg-descr
@@ -1,24 +1,7 @@
-[ excerpt (with adaptations) from developer's README ]
-ffmpeg is a hyper fast realtime audio/video encoder, a streaming
-server and a generic audio and video file converter.
+FFmpeg is a complete, cross-platform solution to record, convert and stream
+audio and video. It includes libavcodec - the leading audio/video codec
+library.
 
-It can convert a standard video source into several file formats
-based on DCT/motion compensation encoding. Sound is compressed in
-MPEG audio layer 2 or using an AC3 compatible stream.
+This version is from the 2.0 release branch.
 
-What makes ffmpeg interesting ?
-- Simple and efficient video encoder: outputs MPEG1, H263, Real
-  Video(tm), MPEG4, DIVX and MJPEG compatible bitstreams using the
-  same encoder core.
-- Hyper fast MPEG audio layer 2 compression (50 times faster than
-  realtime on a K6 500).
-[snip -> rest on website below]
-
-ffmpeg is made of two programs:
-* ffmpeg: soft VCR which encodes in real time to several formats.
-  It can also encode from any supported input file format to any
-  input supported format.
-* ffserver: high performance live broadcast streaming server based
-  on the ffmpeg core encoders.
-
-WWW: http://ffmpeg.mplayerhq.hu/
+WWW: http://ffmpeg.org/
diff --git a/multimedia/ffmpeg/pkg-plist b/multimedia/ffmpeg/pkg-plist
index 7bf6c60c7f47..b0375cbaee9e 100644
--- a/multimedia/ffmpeg/pkg-plist
+++ b/multimedia/ffmpeg/pkg-plist
@@ -4,68 +4,56 @@ bin/ffprobe
 %%FFSERVER%%@unexec if cmp -s %D/etc/ffserver.conf %D/etc/ffserver.conf-dist; then rm -f %D/etc/ffserver.conf; fi
 %%FFSERVER%%etc/ffserver.conf-dist
 %%FFSERVER%%@exec [ -f %B/ffserver.conf ] || cp %B/%f %B/ffserver.conf
-include/ffmpeg/adler32.h
-include/ffmpeg/avcodec.h
-include/ffmpeg/avdevice.h
-include/ffmpeg/avfilter.h
-include/ffmpeg/avformat.h
-include/ffmpeg/avio.h
-include/ffmpeg/avstring.h
-include/ffmpeg/avutil.h
-include/ffmpeg/base64.h
-include/ffmpeg/common.h
-include/ffmpeg/crc.h
-include/ffmpeg/fifo.h
-include/ffmpeg/intfloat_readwrite.h
-include/ffmpeg/log.h
-include/ffmpeg/lzo.h
-include/ffmpeg/mathematics.h
-include/ffmpeg/md5.h
-include/ffmpeg/mem.h
-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
 include/libavcodec/avcodec.h
 include/libavcodec/avfft.h
 include/libavcodec/dxva2.h
-include/libavcodec/opt.h
+include/libavcodec/old_codec_ids.h
 include/libavcodec/vaapi.h
+include/libavcodec/vda.h
 include/libavcodec/vdpau.h
 include/libavcodec/version.h
 include/libavcodec/xvmc.h
 include/libavdevice/avdevice.h
+include/libavdevice/version.h
+include/libavfilter/asrc_abuffer.h
 include/libavfilter/avcodec.h
 include/libavfilter/avfilter.h
 include/libavfilter/avfiltergraph.h
-include/libavfilter/vsink_buffer.h
-include/libavfilter/vsrc_buffer.h
+include/libavfilter/buffersink.h
+include/libavfilter/buffersrc.h
+include/libavfilter/version.h
 include/libavformat/avformat.h
 include/libavformat/avio.h
 include/libavformat/version.h
+include/libavresample/avresample.h
+include/libavresample/version.h
 include/libavutil/adler32.h
 include/libavutil/aes.h
 include/libavutil/attributes.h
+include/libavutil/audio_fifo.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/blowfish.h
+include/libavutil/bprint.h
 include/libavutil/bswap.h
+include/libavutil/buffer.h
+include/libavutil/channel_layout.h
 include/libavutil/common.h
-include/libavutil/crc.h
 include/libavutil/cpu.h
+include/libavutil/crc.h
 include/libavutil/dict.h
 include/libavutil/error.h
 include/libavutil/eval.h
 include/libavutil/fifo.h
 include/libavutil/file.h
+include/libavutil/frame.h
+include/libavutil/hmac.h
 include/libavutil/imgutils.h
+include/libavutil/intfloat.h
 include/libavutil/intfloat_readwrite.h
 include/libavutil/intreadwrite.h
 include/libavutil/lfg.h
@@ -74,77 +62,102 @@ include/libavutil/lzo.h
 include/libavutil/mathematics.h
 include/libavutil/md5.h
 include/libavutil/mem.h
+include/libavutil/murmur3.h
+include/libavutil/old_pix_fmts.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/ripemd.h
 include/libavutil/samplefmt.h
 include/libavutil/sha.h
-include/libavutil/sha1.h
+include/libavutil/sha512.h
+include/libavutil/time.h
+include/libavutil/timecode.h
+include/libavutil/timestamp.h
+include/libavutil/version.h
+include/libavutil/xtea.h
 include/libpostproc/postprocess.h
-include/postproc/postprocess.h
+include/libpostproc/version.h
+include/libswresample/swresample.h
+include/libswresample/version.h
 include/libswscale/swscale.h
+include/libswscale/version.h
 lib/libavcodec.a
 lib/libavcodec.so
-lib/libavcodec.so.1
-lib/libavcodec.so.52.123.0
+lib/libavcodec.so.55
+lib/libavcodec.so.55.18.102
 lib/libavdevice.a
 lib/libavdevice.so
-lib/libavdevice.so.1
-lib/libavdevice.so.52.5.0
+lib/libavdevice.so.55
+lib/libavdevice.so.55.3.100
 lib/libavfilter.a
 lib/libavfilter.so
-lib/libavfilter.so.1.80.0
-lib/libavfilter.so.1
+lib/libavfilter.so.3
+lib/libavfilter.so.3.79.101
 lib/libavformat.a
 lib/libavformat.so
-lib/libavformat.so.1
-lib/libavformat.so.52.111.0
+lib/libavformat.so.55
+lib/libavformat.so.55.12.100
+lib/libavresample.a
+lib/libavresample.so
+lib/libavresample.so.1
+lib/libavresample.so.1.1.0
 lib/libavutil.a
 lib/libavutil.so
-lib/libavutil.so.1
-lib/libavutil.so.50.43.0
+lib/libavutil.so.52
+lib/libavutil.so.52.38.100
 lib/libpostproc.a
 lib/libpostproc.so
-lib/libpostproc.so.1
-lib/libpostproc.so.51.2.0
+lib/libpostproc.so.52
+lib/libpostproc.so.52.3.100
+lib/libswresample.a
+lib/libswresample.so
+lib/libswresample.so.0
+lib/libswresample.so.0.17.102
 lib/libswscale.a
 lib/libswscale.so
-lib/libswscale.so.0.14.1
-lib/libswscale.so.1
+lib/libswscale.so.2
+lib/libswscale.so.2.3.100
 libdata/pkgconfig/libavcodec.pc
 libdata/pkgconfig/libavdevice.pc
 libdata/pkgconfig/libavfilter.pc
 libdata/pkgconfig/libavformat.pc
+libdata/pkgconfig/libavresample.pc
 libdata/pkgconfig/libavutil.pc
 libdata/pkgconfig/libpostproc.pc
+libdata/pkgconfig/libswresample.pc
 libdata/pkgconfig/libswscale.pc
 man/man1/ffmpeg.1.gz
 man/man1/ffprobe.1.gz
-%%FFSERVER%%man/man1/ffserver.1.gz
+%%DATADIR%%/examples/Makefile
+%%DATADIR%%/examples/README
+%%DATADIR%%/examples/decoding_encoding.c
+%%DATADIR%%/examples/demuxing.c
+%%DATADIR%%/examples/filtering_audio.c
+%%DATADIR%%/examples/filtering_video.c
+%%DATADIR%%/examples/metadata.c
+%%DATADIR%%/examples/muxing.c
+%%DATADIR%%/examples/resampling_audio.c
+%%DATADIR%%/examples/scaling_video.c
+%%DATADIR%%/ffprobe.xsd
+%%DATADIR%%/libvpx-1080p.ffpreset
+%%DATADIR%%/libvpx-1080p50_60.ffpreset
 %%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-ipod320.ffpreset
 %%DATADIR%%/libx264-ipod640.ffpreset
-%%DATADIR%%/libx264-lossless_fast.ffpreset
-%%DATADIR%%/libx264-lossless_max.ffpreset
-%%DATADIR%%/libx264-lossless_medium.ffpreset
-%%DATADIR%%/libx264-lossless_slow.ffpreset
-%%DATADIR%%/libx264-lossless_slower.ffpreset
-%%DATADIR%%/libx264-lossless_ultrafast.ffpreset
+@dirrm %%DATADIR%%/examples
 @dirrm %%DATADIR%%
-@dirrm include/postproc
 @dirrm include/libswscale
+@dirrm include/libswresample
 @dirrm include/libpostproc
 @dirrm include/libavutil
+@dirrm include/libavresample
 @dirrm include/libavformat
 @dirrm include/libavfilter
 @dirrm include/libavdevice
 @dirrm include/libavcodec
-@dirrm include/ffmpeg