Attachment #175364 for bug #207547




# $FreeBSD$

PORTNAME=	ffmpeg
PORTVERSION=	3.1.4
PORTREVISION=	2
PORTEPOCH=	1
CATEGORIES=	multimedia audio ipv6 net
MASTER_SITES=	http://ffmpeg.org/releases/

USE_PERL5=	build
SHEBANG_FILES=	doc/texi2pod.pl

PORTSCOUT=	limit:^3\.

OPTIONS_DEFINE= ALSA AMR_NB AMR_WB ASS BS2B CACA CDIO CELT CHROMAPRINT DC1394 \
		DEBUG DOCS FAAC FDK_AAC FFSERVER FLITE FONTCONFIG \
		FREETYPE FREI0R FRIBIDI GME GSM ICONV ILBC JACK KVAZAAR LADSPA \
		LAME LIBBLURAY MODPLUG NETCDF OPENAL OPENCL OPENCV OPENGL \
		OPENH264 OPENJPEG OPTIMIZED_CFLAGS OPUS PULSEAUDIO \
		RUBBERBAND RTCPU SCHROEDINGER SDL SMB SNAPPY SPEEX SSH \
		TESSERACT THEORA TWOLAME V4L VAAPI VDPAU VIDSTAB VORBIS \
		VO_AMRWBENC VPX WAVPACK WEBP X11GRAB X264 X265 XCB XVID \
		XVIDEO ZIMG ZMQ ZVBI

OPTIONS_DEFAULT=	FFSERVER FONTCONFIG FREETYPE FREI0R GNUTLS ICONV \
			OPENCV RTCPU SCHROEDINGER THEORA V4L VAAPI VDPAU \

ASS_DESC=	Subtitles rendering via libass
BS2B_DESC=	Bauer Stereophonic-to-Binaural filter
CDIO_DESC=	Audio CD grabbing with libcdio
CHROMAPRINT_DESC=	Audio fingerprinting with chromaprint
DC1394_DESC=	IIDC-1394 grabbing using libdc1394
FDK_AAC_DESC=	AAC audio encoding via Fraunhofer FDK
FFSERVER_DESC=	Build and install ffserver

KVAZAAR_DESC=	H.265 video codec support via Kvazaar
LICENSE_DESC=	Licensing options
NEON_DESC=	Enable Media Processing Engine instructions
NETCDF_DESC=	SOFAlizer binaural filter
NONFREE_DESC=	Allow use of nonfree code
OPENH264_DESC=	H.264 video codec support via OpenH264
RUBBERBAND_DESC=Time-stretching and pitch-shifting with librubberband
RTCPU_DESC=	Detect CPU capabilities at runtime
LIBRTMP_DESC=	RTMP protocol support via librtmp
TESSERACT_DESC=	Optical Character Recognition via Tesseract
VFP_DESC=	Enable Vector Floating Point instructions
VIDSTAB_DESC=	Video stabilization filter
X11GRAB_DESC=	X11 grabbing (legacy)
XCB_DESC=	X11 grabbing using XCB
ZIMG_DESC=	"z" library video scaling filter
ZMQ_DESC=	Message passing via libzmq${ZMQ_VERSION}
ZVBI_DESC=	Teletext support via libzvbi

OPTIONS_SUB=	yes

# aacplus
AACPLUS_LIB_DEPENDS=	libaacplus.so:audio/libaacplus
AACPLUS_CONFIGURE_ENABLE=	libaacplus
AACPLUS_IMPLIES=	NONFREE

# alsa
ALSA_CONFIGURE_OFF=	--disable-indev=alsa \
			--disable-outdev=alsa

CELT_LIB_DEPENDS=	libcelt0.so:audio/celt
CELT_CONFIGURE_ENABLE=	libcelt

# chromaprint
CHROMAPRINT_BROKEN=		Dependency loop
CHROMAPRINT_LIB_DEPENDS=	libchromaprint.so:audio/chromaprint
CHROMAPRINT_CONFIGURE_ENABLE=	chromaprint

# dc1394
DC1394_LIB_DEPENDS=	libdc1394.so:multimedia/libdc1394
DC1394_CONFIGURE_ENABLE=	libdc1394

FRIBIDI_LIB_DEPENDS=	libfribidi.so:converters/fribidi
FRIBIDI_CONFIGURE_ENABLE=	libfribidi

# gcrypt
GCRYPT_LIB_DEPENDS=	libgcrypt.so:security/libgcrypt
GCRYPT_CONFIGURE_ENABLE=	gcrypt

# gnutls
GNUTLS_LIB_DEPENDS=	libgnutls.so:security/gnutls
GNUTLS_CONFIGURE_ENABLE=	gnutls

GME_LIB_DEPENDS=	libgme.so:audio/libgme
GME_CONFIGURE_ENABLE=	libgme

# gmp
GMP_LIB_DEPENDS=	libgmp.so:math/gmp
GMP_CONFIGURE_ENABLE=	gmp
GMP_IMPLIES=		GPL3

# gsm
GSM_LIB_DEPENDS=	libgsm.so:audio/gsm
GSM_CONFIGURE_ENABLE=	libgsm

MODPLUG_LIB_DEPENDS=	libmodplug.so:audio/libmodplug
MODPLUG_CONFIGURE_ENABLE=	libmodplug

# netcdf
NETCDF_LIB_DEPENDS=	libnetcdf.so:science/netcdf
NETCDF_CONFIGURE_ENABLE=	netcdf

# OpenAL
OPENAL_LIB_DEPENDS=	libopenal.so:audio/openal-soft
OPENAL_CONFIGURE_ENABLE=	openal

# openjpeg
OPENJPEG_LIB_DEPENDS=	libopenjpeg.so:graphics/openjpeg15
OPENJPEG_CONFIGURE_ENABLE=	libopenjpeg
OPENJPEG_EXTRA_PATCHES=	${FILESDIR}/extra-patch-openjpeg2_linkfix

# openssl
OPENSSL_USE=		OPENSSL=yes

PULSEAUDIO_CONFIGURE_OFF=	--disable-indev=pulse \
				--disable-outdev=pulse

# rubberband
RUBBERBAND_LIB_DEPENDS=	librubberband.so:audio/rubberband
RUBBERBAND_CONFIGURE_ENABLE=	librubberband

# rtcpu
RTCPU_CONFIGURE_ENABLE=	runtime-cpudetect

# rtmp
LIBRTMP_LIB_DEPENDS=	librtmp.so:multimedia/librtmp
LIBRTMP_CONFIGURE_ENABLE=	librtmp

# schroedinger
SCHROEDINGER_LIB_DEPENDS=	libschroedinger-1.0.so:multimedia/schroedinger

SSH_LIB_DEPENDS=	libssh.so:security/libssh
SSH_CONFIGURE_ENABLE=	libssh

# tesseract
TESSERACT_LIB_DEPENDS=	libtesseract.so:graphics/tesseract
TESSERACT_CONFIGURE_ENABLE=	libtesseract

# theora
THEORA_LIB_DEPENDS=	libtheora.so:multimedia/libtheora
THEORA_CONFIGURE_ENABLE=	libtheora

NEON_CONFIGURE_ENABLE=	neon
NEON_CONFIGURE_ON=	--cpu=armv7-a

# vo-aacenc
VO_AACENC_LIB_DEPENDS=	libvo-aacenc.so:audio/vo-aacenc
VO_AACENC_CONFIGURE_ENABLE=	libvo-aacenc
VO_AACENC_IMPLIES=	GPL3

# vo-amrwbenc
VO_AMRWBENC_LIB_DEPENDS=	libvo-amrwbenc.so:audio/vo-amrwbenc
VO_AMRWBENC_CONFIGURE_ENABLE=	libvo-amrwbenc

XVIDEO_USE=		XORG=xv
XVIDEO_CONFIGURE_OFF=	--disable-outdev=xv

# zimg
ZIMG_LIB_DEPENDS=	libzimg.so:graphics/sekrit-twc-zimg
ZIMG_CONFIGURE_ENABLE=	libzimg

# zmq
ZMQ_LIB_DEPENDS=	libzmq.so:net/libzmq${ZMQ_VERSION}
ZMQ_CONFIGURE_ENABLE=	libzmq

		--enable-avfilter \
		--enable-avresample \
		--enable-pthreads \
		--disable-libstagefright-h264 \
		--disable-libutvideo \
		--disable-libsoxr \
		--cc="${CC}" \
		--extra-cflags="${FFMPEG_CFLAGS} -I${LOCALBASE}/include" \

		s|gsm/gsm.h|gsm.h|g" \
		${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT}
	@${REINPLACE_CMD} -e 's|-ldl||' \
		-e 's|require_pkg_config opencv|require_pkg_config opencv-core|g' \
		-e 's|freetype/freetype.h|freetype.h|g' \
		${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT}

post-patch-SDL-on:

	@${REINPLACE_CMD} -E \
		-e 's|sdl-config|${SDL_CONFIG}|g' \
		${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT}
	@${REINPLACE_CMD} -E \
		-e 's|#include <SDL|#include <SDL/SDL|' \
		${WRKSRC}/ffplay.c \
		${WRKSRC}/libavdevice/opengl_enc.c \
		${WRKSRC}/libavdevice/sdl.c

post-configure-THEORA-off:
	@${REINPLACE_CMD} -E \

Lines 1-3 Link Here

(-)b/head/multimedia/ffmpeg/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1474303802	1	TIMESTAMP = 1475332732
2	SHA256 (ffmpeg-2.8.8.tar.bz2) = b70848958feadca180315d17b1131a1b519527971590e6ee8363a4c568ed06a6	2	SHA256 (ffmpeg-3.1.4.tar.bz2) = 7c99df75a4dc12d22c0f1ed11d0acf98cac1f8b5fe7a7434344b167f810bcbfa
3	SIZE (ffmpeg-2.8.8.tar.bz2) = 8583641	3	SIZE (ffmpeg-3.1.4.tar.bz2) = 9334429




--- configure.orig	2016-10-01 01:12:41 UTC
+++ configure
@@ -5671,7 +5671,7 @@ enabled libopencv         && { check_hea
                                  require opencv opencv2/core/core_c.h cvCreateImageHeader -lopencv_core -lopencv_imgproc; } ||
                                require_pkg_config opencv opencv/cxcore.h cvCreateImageHeader; }
 enabled libopenh264       && require_pkg_config openh264 wels/codec_api.h WelsGetCodecVersion
-enabled libopenjpeg       && { check_lib openjpeg-2.1/openjpeg.h opj_version -lopenjp2 -DOPJ_STATIC ||
+enabled libopenjpeg       && { check_lib openjpeg-2.1/openjpeg.h opj_version -lopenjp2 ||
                                check_lib openjpeg-2.0/openjpeg.h opj_version -lopenjp2 -DOPJ_STATIC ||
                                check_lib openjpeg-1.5/openjpeg.h opj_version -lopenjpeg -DOPJ_STATIC ||
                                check_lib openjpeg.h opj_version -lopenjpeg -DOPJ_STATIC ||
--- libavcodec/libopenjpegdec.c.orig	2016-10-01 01:12:41 UTC
+++ libavcodec/libopenjpegdec.c
@@ -24,8 +24,6 @@
  * JPEG 2000 decoder using libopenjpeg
  */
 
-#define  OPJ_STATIC
-
 #include "libavutil/common.h"
 #include "libavutil/imgutils.h"
 #include "libavutil/intreadwrite.h"
--- libavcodec/libopenjpegenc.c.orig	2016-10-01 01:12:41 UTC
+++ libavcodec/libopenjpegenc.c
@@ -24,8 +24,6 @@
  * JPEG 2000 encoder using libopenjpeg
  */
 
-#define  OPJ_STATIC
-
 #include "libavutil/avassert.h"
 #include "libavutil/common.h"
 #include "libavutil/imgutils.h"




From b3777b2c2eb5d04386992c0388985914d5bbebba Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Arttu=20Yl=C3=A4-Outinen?= <arttu.yla-outinen@tut.fi>
Date: Mon, 28 Sep 2015 10:55:14 +0300
Subject: libkvazaar: Update to work with the latest version
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Function encoder_encode in Kvazaar API was changed to have new output
parameters: source picture and frame info. Frame info is used to set the
keyframe flag and source picture is ignored.

Signed-off-by: Arttu Ylä-Outinen <arttu.yla-outinen@tut.fi>
---
 libavcodec/libkvazaar.c | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git configure configure
index 4cc45ad..af3fbf4 100755
--- configure
+++ configure
@@ -5237,7 +5237,7 @@
                                    check_lib "${gsm_hdr}" gsm_create -lgsm && break;
                                done || die "ERROR: libgsm not found"; }
 enabled libilbc           && require libilbc ilbc.h WebRtcIlbcfix_InitDecode -lilbc
-enabled libkvazaar        && require_pkg_config "kvazaar < 0.7.0" kvazaar.h kvz_api_get
+enabled libkvazaar        && require_pkg_config "kvazaar >= 0.7.0" kvazaar.h kvz_api_get
 enabled libmfx            && require_pkg_config libmfx "mfx/mfxvideo.h" MFXInit
 enabled libmodplug        && require_pkg_config libmodplug libmodplug/modplug.h ModPlug_Load
 enabled libmp3lame        && require "libmp3lame >= 3.98.3" lame/lame.h lame_set_VBR_quality -lmp3lame
diff --git libavcodec/libkvazaar.c libavcodec/libkvazaar.c
index 9fb5be7..7430e0a 100644
--- libavcodec/libkvazaar.c
+++ libavcodec/libkvazaar.c
@@ -137,8 +137,11 @@ static int libkvazaar_encode(AVCodecContext *avctx,
 {
     int retval = 0;
     kvz_picture *img_in = NULL;
+
     kvz_data_chunk *data_out = NULL;
     uint32_t len_out = 0;
+    kvz_frame_info frame_info;
+
     LibkvazaarContext *ctx = avctx->priv_data;
 
     *got_packet_ptr = 0;
@@ -173,7 +176,10 @@ static int libkvazaar_encode(AVCodecContext *avctx,
         }
     }
 
-    if (!ctx->api->encoder_encode(ctx->encoder, img_in, &data_out, &len_out, NULL)) {
+    if (!ctx->api->encoder_encode(ctx->encoder, img_in,
+                                  &data_out, &len_out,
+                                  NULL, NULL,
+                                  &frame_info)) {
         av_log(avctx, AV_LOG_ERROR, "Failed to encode frame.\n");
         retval = AVERROR_EXTERNAL;
         goto done;
@@ -198,6 +204,14 @@ static int libkvazaar_encode(AVCodecContext *avctx,
 
         ctx->api->chunk_free(data_out);
         data_out = NULL;
+
+        avpkt->flags = 0;
+        // IRAP VCL NAL unit types span the range
+        // [BLA_W_LP (16), RSV_IRAP_VCL23 (23)].
+        if (frame_info.nal_unit_type >= KVZ_NAL_BLA_W_LP &&
+                frame_info.nal_unit_type <= KVZ_NAL_RSV_IRAP_VCL23) {
+            avpkt->flags |= AV_PKT_FLAG_KEY;
+        }
     }
 
 done:

Lines 1-9 Link Here

(-)b/head/multimedia/ffmpeg/files/patch-libavcodec-Makefile (-5 / +5 lines)
1	--- libavcodec/Makefile.orig 2015-06-19 20:44:36 UTC	1	--- libavcodec/Makefile.orig 2016-02-15 02:29:38 UTC
2	+++ libavcodec/Makefile	2	+++ libavcodec/Makefile
3	@@ -877,7 +877,7 @@ SKIPHEADERS +	3	@@ -935,7 +935,7 @@ SKIPHEADERS +
4	old_codec_ids.h \	4	aaccoder_trellis.h \
5	tableprint.h \	5	aacenc_quantization.h \
6	tableprint_vlc.h \	6	aacenc_quantization_misc.h \
7	- $(ARCH)/vp56_arith.h \	7	- $(ARCH)/vp56_arith.h \
8	+ $(FFMPEG_ARCH)/vp56_arith.h \	8	+ $(FFMPEG_ARCH)/vp56_arith.h \
9		9




--- libavfilter/vf_libopencv.c.orig	2015-06-19 20:44:50 UTC
+++ libavfilter/vf_libopencv.c
@@ -23,8 +23,7 @@
  * libopencv wrapper functions
  */
 
-#include <opencv/cv.h>
-#include <opencv/cxcore.h>
+#include <opencv2/imgproc/imgproc_c.h>
 #include "libavutil/avstring.h"
 #include "libavutil/common.h"
 #include "libavutil/file.h"

Added Link Here

(-)b/head/multimedia/ffmpeg/files/patch-tests_checkasm_Makefile (+11 lines)
1	--- tests/checkasm/Makefile.orig 2016-10-01 01:12:42 UTC
2	+++ tests/checkasm/Makefile
3	@@ -24,7 +24,7 @@ AVFILTEROBJS-$(CONFIG_COLORSPACE_FILTER)
4	CHECKASMOBJS-$(CONFIG_AVFILTER) += $(AVFILTEROBJS-yes)
5
6
7	--include $(SRC_PATH)/tests/checkasm/$(ARCH)/Makefile
8	+-include $(SRC_PATH)/tests/checkasm/$(FFMPEG_ARCH)/Makefile
9
10	CHECKASMOBJS += $(CHECKASMOBJS-yes) checkasm.o
11	CHECKASMOBJS := $(sort $(CHECKASMOBJS:%=tests/checkasm/%))




bin/ffprobe
%%FFSERVER%%bin/ffserver
%%FFSERVER%%@sample etc/ffserver.conf.sample
%%OPENCL%%include/libavutil/opencl.h
include/libavcodec/avcodec.h
include/libavcodec/avdct.h
include/libavcodec/avfft.h
include/libavcodec/d3d11va.h
include/libavcodec/dirac.h
include/libavcodec/dv_profile.h
include/libavcodec/dxva2.h
include/libavcodec/jni.h
include/libavcodec/qsv.h
include/libavcodec/vaapi.h
include/libavcodec/vda.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/buffersink.h

include/libavresample/version.h
include/libavutil/adler32.h
include/libavutil/aes.h
include/libavutil/aes_ctr.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/common.h
include/libavutil/cpu.h
include/libavutil/crc.h
include/libavutil/des.h
include/libavutil/dict.h
include/libavutil/display.h
include/libavutil/downmix_info.h

include/libavutil/frame.h
include/libavutil/hash.h
include/libavutil/hmac.h
include/libavutil/hwcontext.h
include/libavutil/hwcontext_cuda.h
include/libavutil/hwcontext_dxva2.h
include/libavutil/hwcontext_vaapi.h
include/libavutil/hwcontext_vdpau.h
include/libavutil/imgutils.h
include/libavutil/intfloat.h
include/libavutil/intreadwrite.h

include/libavutil/log.h
include/libavutil/lzo.h
include/libavutil/macros.h
include/libavutil/mastering_display_metadata.h
include/libavutil/mathematics.h
include/libavutil/md5.h
include/libavutil/mem.h
include/libavutil/motion_vector.h
include/libavutil/murmur3.h
include/libavutil/old_pix_fmts.h
%%OPENCL%%include/libavutil/opencl.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/rc4.h
include/libavutil/replaygain.h
include/libavutil/ripemd.h
include/libavutil/samplefmt.h

include/libavutil/time.h
include/libavutil/timecode.h
include/libavutil/timestamp.h
include/libavutil/tree.h
include/libavutil/twofish.h
include/libavutil/version.h
include/libavutil/xtea.h

include/libswscale/version.h
lib/libavcodec.a
lib/libavcodec.so
lib/libavcodec.so.57
lib/libavcodec.so.57.48.101
lib/libavdevice.a
lib/libavdevice.so
lib/libavdevice.so.57
lib/libavdevice.so.57.0.101
lib/libavfilter.a
lib/libavfilter.so
lib/libavfilter.so.6
lib/libavfilter.so.6.47.100
lib/libavformat.a
lib/libavformat.so
lib/libavformat.so.57
lib/libavformat.so.57.41.100
lib/libavresample.a
lib/libavresample.so
lib/libavresample.so.3
lib/libavresample.so.3.0.0
lib/libavutil.a
lib/libavutil.so
lib/libavutil.so.55
lib/libavutil.so.55.28.100
lib/libpostproc.a
lib/libpostproc.so
lib/libpostproc.so.54
lib/libpostproc.so.54.0.100
lib/libswresample.a
lib/libswresample.so
lib/libswresample.so.2
lib/libswresample.so.2.1.100
lib/libswscale.a
lib/libswscale.so
lib/libswscale.so.4
lib/libswscale.so.4.1.100
libdata/pkgconfig/libavcodec.pc
libdata/pkgconfig/libavdevice.pc
libdata/pkgconfig/libavfilter.pc

Return to bug 207547

Lines 2-9 Link Here

(-)b/head/multimedia/ffmpeg/Makefile (-32 / +52 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= ffmpeg	4	PORTNAME= ffmpeg
5	PORTVERSION= 2.8.8	5	PORTVERSION= 3.1.4
6	PORTREVISION= 2
7	PORTEPOCH= 1	6	PORTEPOCH= 1
8	CATEGORIES= multimedia audio ipv6 net	7	CATEGORIES= multimedia audio ipv6 net
9	MASTER_SITES= http://ffmpeg.org/releases/	8	MASTER_SITES= http://ffmpeg.org/releases/
Lines 23-39 Link Here
23	USE_PERL5= build	22	USE_PERL5= build
24	SHEBANG_FILES= doc/texi2pod.pl	23	SHEBANG_FILES= doc/texi2pod.pl
25		24
26	PORTSCOUT= limit:^2\.	25	PORTSCOUT= limit:^3\.
27		26
28	OPTIONS_DEFINE= AACPLUS ALSA AMR_NB AMR_WB ASS BS2B CACA CDIO CELT DC1394 \	27	OPTIONS_DEFINE= ALSA AMR_NB AMR_WB ASS BS2B CACA CDIO CELT CHROMAPRINT DC1394 \
29	DEBUG DOCS FAAC FDK_AAC FFSERVER FLITE FONTCONFIG \	28	DEBUG DOCS FAAC FDK_AAC FFSERVER FLITE FONTCONFIG \
30	FREETYPE FREI0R FRIBIDI GME GSM ICONV ILBC JACK KVAZAAR LADSPA \	29	FREETYPE FREI0R FRIBIDI GME GSM ICONV ILBC JACK KVAZAAR LADSPA \
31	LAME LIBBLURAY MODPLUG OPENAL OPENCL OPENCV OPENGL \	30	LAME LIBBLURAY MODPLUG NETCDF OPENAL OPENCL OPENCV OPENGL \
32	OPENH264 OPENJPEG OPTIMIZED_CFLAGS OPUS PULSEAUDIO QUVI \	31	OPENH264 OPENJPEG OPTIMIZED_CFLAGS OPUS PULSEAUDIO \
33	RTCPU RTMP SCHROEDINGER SDL SMB SNAPPY SPEEX SSH \	32	RUBBERBAND RTCPU SCHROEDINGER SDL SMB SNAPPY SPEEX SSH \
34	THEORA TWOLAME V4L VAAPI VDPAU VIDSTAB VORBIS VO_AACENC \	33	TESSERACT THEORA TWOLAME V4L VAAPI VDPAU VIDSTAB VORBIS \
35	VO_AMRWBENC VPX WAVPACK WEBP X11GRAB X264 X265 XCB XVID \	34	VO_AMRWBENC VPX WAVPACK WEBP X11GRAB X264 X265 XCB XVID \
36	XVIDEO ZMQ ZVBI	35	XVIDEO ZIMG ZMQ ZVBI
37		36
38	OPTIONS_DEFAULT= FFSERVER FONTCONFIG FREETYPE FREI0R GNUTLS ICONV \	37	OPTIONS_DEFAULT= FFSERVER FONTCONFIG FREETYPE FREI0R GNUTLS ICONV \
39	OPENCV RTCPU SCHROEDINGER THEORA V4L VAAPI VDPAU \	38	OPENCV RTCPU SCHROEDINGER THEORA V4L VAAPI VDPAU \
Lines 54-59 Link Here
54	ASS_DESC= Subtitles rendering via libass	53	ASS_DESC= Subtitles rendering via libass
55	BS2B_DESC= Bauer Stereophonic-to-Binaural filter	54	BS2B_DESC= Bauer Stereophonic-to-Binaural filter
56	CDIO_DESC= Audio CD grabbing with libcdio	55	CDIO_DESC= Audio CD grabbing with libcdio
		56	CHROMAPRINT_DESC= Audio fingerprinting with chromaprint
57	DC1394_DESC= IIDC-1394 grabbing using libdc1394	57	DC1394_DESC= IIDC-1394 grabbing using libdc1394
58	FDK_AAC_DESC= AAC audio encoding via Fraunhofer FDK	58	FDK_AAC_DESC= AAC audio encoding via Fraunhofer FDK
59	FFSERVER_DESC= Build and install ffserver	59	FFSERVER_DESC= Build and install ffserver
Lines 64-87 Link Here
64	KVAZAAR_DESC= H.265 video codec support via Kvazaar	64	KVAZAAR_DESC= H.265 video codec support via Kvazaar
65	LICENSE_DESC= Licensing options	65	LICENSE_DESC= Licensing options
66	NEON_DESC= Enable Media Processing Engine instructions	66	NEON_DESC= Enable Media Processing Engine instructions
		67	NETCDF_DESC= SOFAlizer binaural filter
67	NONFREE_DESC= Allow use of nonfree code	68	NONFREE_DESC= Allow use of nonfree code
68	OPENH264_DESC= H.264 video codec support via OpenH264	69	OPENH264_DESC= H.264 video codec support via OpenH264
69	QUVI_DESC= Flash media stream URLs	70	RUBBERBAND_DESC=Time-stretching and pitch-shifting with librubberband
70	RTCPU_DESC= Detect CPU capabilities at runtime	71	RTCPU_DESC= Detect CPU capabilities at runtime
		72	LIBRTMP_DESC= RTMP protocol support via librtmp
		73	TESSERACT_DESC= Optical Character Recognition via Tesseract
71	VFP_DESC= Enable Vector Floating Point instructions	74	VFP_DESC= Enable Vector Floating Point instructions
72	VIDSTAB_DESC= Video stabilization filter	75	VIDSTAB_DESC= Video stabilization filter
73	X11GRAB_DESC= X11 grabbing (legacy)	76	X11GRAB_DESC= X11 grabbing (legacy)
74	XCB_DESC= X11 grabbing using XCB	77	XCB_DESC= X11 grabbing using XCB
		78	ZIMG_DESC= "z" library video scaling filter
75	ZMQ_DESC= Message passing via libzmq${ZMQ_VERSION}	79	ZMQ_DESC= Message passing via libzmq${ZMQ_VERSION}
76	ZVBI_DESC= Teletext support via libzvbi	80	ZVBI_DESC= Teletext support via libzvbi
77		81
78	OPTIONS_SUB= yes	82	OPTIONS_SUB= yes
79		83
80	# aacplus
81	AACPLUS_LIB_DEPENDS= libaacplus.so:audio/libaacplus
82	AACPLUS_CONFIGURE_ENABLE= libaacplus
83	AACPLUS_IMPLIES= NONFREE
84
85	# alsa	84	# alsa
86	ALSA_CONFIGURE_OFF= --disable-indev=alsa \	85	ALSA_CONFIGURE_OFF= --disable-indev=alsa \
87	--disable-outdev=alsa	86	--disable-outdev=alsa
Lines 117-122 Link Here
117	CELT_LIB_DEPENDS= libcelt0.so:audio/celt	116	CELT_LIB_DEPENDS= libcelt0.so:audio/celt
118	CELT_CONFIGURE_ENABLE= libcelt	117	CELT_CONFIGURE_ENABLE= libcelt
119		118
		119	# chromaprint
		120	CHROMAPRINT_BROKEN= Dependency loop
		121	CHROMAPRINT_LIB_DEPENDS= libchromaprint.so:audio/chromaprint
		122	CHROMAPRINT_CONFIGURE_ENABLE= chromaprint
		123
120	# dc1394	124	# dc1394
121	DC1394_LIB_DEPENDS= libdc1394.so:multimedia/libdc1394	125	DC1394_LIB_DEPENDS= libdc1394.so:multimedia/libdc1394
122	DC1394_CONFIGURE_ENABLE= libdc1394	126	DC1394_CONFIGURE_ENABLE= libdc1394
Lines 163-168 Link Here
163	FRIBIDI_LIB_DEPENDS= libfribidi.so:converters/fribidi	167	FRIBIDI_LIB_DEPENDS= libfribidi.so:converters/fribidi
164	FRIBIDI_CONFIGURE_ENABLE= libfribidi	168	FRIBIDI_CONFIGURE_ENABLE= libfribidi
165		169
		170	# gcrypt
		171	GCRYPT_LIB_DEPENDS= libgcrypt.so:security/libgcrypt
		172	GCRYPT_CONFIGURE_ENABLE= gcrypt
		173
166	# gnutls	174	# gnutls
167	GNUTLS_LIB_DEPENDS= libgnutls.so:security/gnutls	175	GNUTLS_LIB_DEPENDS= libgnutls.so:security/gnutls
168	GNUTLS_CONFIGURE_ENABLE= gnutls	176	GNUTLS_CONFIGURE_ENABLE= gnutls
Lines 171-176 Link Here
171	GME_LIB_DEPENDS= libgme.so:audio/libgme	179	GME_LIB_DEPENDS= libgme.so:audio/libgme
172	GME_CONFIGURE_ENABLE= libgme	180	GME_CONFIGURE_ENABLE= libgme
173		181
		182	# gmp
		183	GMP_LIB_DEPENDS= libgmp.so:math/gmp
		184	GMP_CONFIGURE_ENABLE= gmp
		185	GMP_IMPLIES= GPL3
		186
174	# gsm	187	# gsm
175	GSM_LIB_DEPENDS= libgsm.so:audio/gsm	188	GSM_LIB_DEPENDS= libgsm.so:audio/gsm
176	GSM_CONFIGURE_ENABLE= libgsm	189	GSM_CONFIGURE_ENABLE= libgsm
Lines 218-223 Link Here
218	MODPLUG_LIB_DEPENDS= libmodplug.so:audio/libmodplug	231	MODPLUG_LIB_DEPENDS= libmodplug.so:audio/libmodplug
219	MODPLUG_CONFIGURE_ENABLE= libmodplug	232	MODPLUG_CONFIGURE_ENABLE= libmodplug
220		233
		234	# netcdf
		235	NETCDF_LIB_DEPENDS= libnetcdf.so:science/netcdf
		236	NETCDF_CONFIGURE_ENABLE= netcdf
		237
221	# OpenAL	238	# OpenAL
222	OPENAL_LIB_DEPENDS= libopenal.so:audio/openal-soft	239	OPENAL_LIB_DEPENDS= libopenal.so:audio/openal-soft
223	OPENAL_CONFIGURE_ENABLE= openal	240	OPENAL_CONFIGURE_ENABLE= openal
Lines 243-248 Link Here
243	# openjpeg	260	# openjpeg
244	OPENJPEG_LIB_DEPENDS= libopenjpeg.so:graphics/openjpeg15	261	OPENJPEG_LIB_DEPENDS= libopenjpeg.so:graphics/openjpeg15
245	OPENJPEG_CONFIGURE_ENABLE= libopenjpeg	262	OPENJPEG_CONFIGURE_ENABLE= libopenjpeg
		263	OPENJPEG_EXTRA_PATCHES= ${FILESDIR}/extra-patch-openjpeg2_linkfix
246		264
247	# openssl	265	# openssl
248	OPENSSL_USE= OPENSSL=yes	266	OPENSSL_USE= OPENSSL=yes
Lines 262-277 Link Here
262	PULSEAUDIO_CONFIGURE_OFF= --disable-indev=pulse \	280	PULSEAUDIO_CONFIGURE_OFF= --disable-indev=pulse \
263	--disable-outdev=pulse	281	--disable-outdev=pulse
264		282
265	# quvi	283	# rubberband
266	QUVI_LIB_DEPENDS= libquvi.so:multimedia/libquvi	284	RUBBERBAND_LIB_DEPENDS= librubberband.so:audio/rubberband
267	QUVI_CONFIGURE_ENABLE= libquvi	285	RUBBERBAND_CONFIGURE_ENABLE= librubberband
268		286
269	# rtcpu	287	# rtcpu
270	RTCPU_CONFIGURE_ENABLE= runtime-cpudetect	288	RTCPU_CONFIGURE_ENABLE= runtime-cpudetect
271		289
272	# rtmp	290	# rtmp
273	RTMP_LIB_DEPENDS= librtmp.so:multimedia/librtmp	291	LIBRTMP_LIB_DEPENDS= librtmp.so:multimedia/librtmp
274	RTMP_CONFIGURE_ENABLE= librtmp	292	LIBRTMP_CONFIGURE_ENABLE= librtmp
275		293
276	# schroedinger	294	# schroedinger
277	SCHROEDINGER_LIB_DEPENDS= libschroedinger-1.0.so:multimedia/schroedinger	295	SCHROEDINGER_LIB_DEPENDS= libschroedinger-1.0.so:multimedia/schroedinger
Lines 304-309 Link Here
304	SSH_LIB_DEPENDS= libssh.so:security/libssh	322	SSH_LIB_DEPENDS= libssh.so:security/libssh
305	SSH_CONFIGURE_ENABLE= libssh	323	SSH_CONFIGURE_ENABLE= libssh
306		324
		325	# tesseract
		326	TESSERACT_LIB_DEPENDS= libtesseract.so:graphics/tesseract
		327	TESSERACT_CONFIGURE_ENABLE= libtesseract
		328
307	# theora	329	# theora
308	THEORA_LIB_DEPENDS= libtheora.so:multimedia/libtheora	330	THEORA_LIB_DEPENDS= libtheora.so:multimedia/libtheora
309	THEORA_CONFIGURE_ENABLE= libtheora	331	THEORA_CONFIGURE_ENABLE= libtheora
Lines 325-335 Link Here
325	NEON_CONFIGURE_ENABLE= neon	347	NEON_CONFIGURE_ENABLE= neon
326	NEON_CONFIGURE_ON= --cpu=armv7-a	348	NEON_CONFIGURE_ON= --cpu=armv7-a
327		349
328	# vo-aacenc
329	VO_AACENC_LIB_DEPENDS= libvo-aacenc.so:audio/vo-aacenc
330	VO_AACENC_CONFIGURE_ENABLE= libvo-aacenc
331	VO_AACENC_IMPLIES= GPL3
332
333	# vo-amrwbenc	350	# vo-amrwbenc
334	VO_AMRWBENC_LIB_DEPENDS= libvo-amrwbenc.so:audio/vo-amrwbenc	351	VO_AMRWBENC_LIB_DEPENDS= libvo-amrwbenc.so:audio/vo-amrwbenc
335	VO_AMRWBENC_CONFIGURE_ENABLE= libvo-amrwbenc	352	VO_AMRWBENC_CONFIGURE_ENABLE= libvo-amrwbenc
Lines 380-385 Link Here
380	XVIDEO_USE= XORG=xv	397	XVIDEO_USE= XORG=xv
381	XVIDEO_CONFIGURE_OFF= --disable-outdev=xv	398	XVIDEO_CONFIGURE_OFF= --disable-outdev=xv
382		399
		400	# zimg
		401	ZIMG_LIB_DEPENDS= libzimg.so:graphics/sekrit-twc-zimg
		402	ZIMG_CONFIGURE_ENABLE= libzimg
		403
383	# zmq	404	# zmq
384	ZMQ_LIB_DEPENDS= libzmq.so:net/libzmq${ZMQ_VERSION}	405	ZMQ_LIB_DEPENDS= libzmq.so:net/libzmq${ZMQ_VERSION}
385	ZMQ_CONFIGURE_ENABLE= libzmq	406	ZMQ_CONFIGURE_ENABLE= libzmq
Lines 418-425 Link Here
418	--enable-avfilter \	439	--enable-avfilter \
419	--enable-avresample \	440	--enable-avresample \
420	--enable-pthreads \	441	--enable-pthreads \
421	--disable-libstagefright-h264 \
422	--disable-libutvideo \
423	--disable-libsoxr \	442	--disable-libsoxr \
424	--cc="${CC}" \	443	--cc="${CC}" \
425	--extra-cflags="${FFMPEG_CFLAGS} -I${LOCALBASE}/include" \	444	--extra-cflags="${FFMPEG_CFLAGS} -I${LOCALBASE}/include" \
Lines 451-458 Link Here
451	s\|gsm/gsm.h\|gsm.h\|g" \	470	s\|gsm/gsm.h\|gsm.h\|g" \
452	${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT}	471	${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT}
453	@${REINPLACE_CMD} -e 's\|-ldl\|\|' \	472	@${REINPLACE_CMD} -e 's\|-ldl\|\|' \
454	-e 's\|opencv opencv/cxcore.h\|opencv-core opencv2/core/core_c.h\|g' \	473	-e 's\|require_pkg_config opencv\|require_pkg_config opencv-core\|g' \
455	-e 's\|freetype/freetype.h\|freetype.h\|g' \
456	${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT}	474	${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT}
457		475
458	post-patch-SDL-on:	476	post-patch-SDL-on:
Lines 459-467 Link Here
459	@${REINPLACE_CMD} -E \	477	@${REINPLACE_CMD} -E \
460	-e 's\|sdl-config\|${SDL_CONFIG}\|g' \	478	-e 's\|sdl-config\|${SDL_CONFIG}\|g' \
461	${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT}	479	${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT}
462	@${FIND} ${WRKSRC} -type f \| \	480	@${REINPLACE_CMD} -E \
463	${XARGS} -n 10 ${REINPLACE_CMD} -E \	481	-e 's\|#include <SDL\|#include <SDL/SDL\|' \
464	-e 's\|#include <SDL\|#include <SDL/SDL\|'	482	${WRKSRC}/ffplay.c \
		483	${WRKSRC}/libavdevice/opengl_enc.c \
		484	${WRKSRC}/libavdevice/sdl.c
465		485
466	post-configure-THEORA-off:	486	post-configure-THEORA-off:
467	@${REINPLACE_CMD} -E \	487	@${REINPLACE_CMD} -E \

Added Link Here

(-)b/head/multimedia/ffmpeg/files/extra-patch-openjpeg2_linkfix (+33 lines)
1	--- configure.orig 2016-10-01 01:12:41 UTC
2	+++ configure
3	@@ -5671,7 +5671,7 @@ enabled libopencv && { check_hea
4	require opencv opencv2/core/core_c.h cvCreateImageHeader -lopencv_core -lopencv_imgproc; } \|\|
5	require_pkg_config opencv opencv/cxcore.h cvCreateImageHeader; }
6	enabled libopenh264 && require_pkg_config openh264 wels/codec_api.h WelsGetCodecVersion
7	-enabled libopenjpeg && { check_lib openjpeg-2.1/openjpeg.h opj_version -lopenjp2 -DOPJ_STATIC \|\|
8	+enabled libopenjpeg && { check_lib openjpeg-2.1/openjpeg.h opj_version -lopenjp2 \|\|
9	check_lib openjpeg-2.0/openjpeg.h opj_version -lopenjp2 -DOPJ_STATIC \|\|
10	check_lib openjpeg-1.5/openjpeg.h opj_version -lopenjpeg -DOPJ_STATIC \|\|
11	check_lib openjpeg.h opj_version -lopenjpeg -DOPJ_STATIC \|\|
12	--- libavcodec/libopenjpegdec.c.orig 2016-10-01 01:12:41 UTC
13	+++ libavcodec/libopenjpegdec.c
14	@@ -24,8 +24,6 @@
15	* JPEG 2000 decoder using libopenjpeg
16	*/
17
18	-#define OPJ_STATIC
19	-
20	#include "libavutil/common.h"
21	#include "libavutil/imgutils.h"
22	#include "libavutil/intreadwrite.h"
23	--- libavcodec/libopenjpegenc.c.orig 2016-10-01 01:12:41 UTC
24	+++ libavcodec/libopenjpegenc.c
25	@@ -24,8 +24,6 @@
26	* JPEG 2000 encoder using libopenjpeg
27	*/
28
29	-#define OPJ_STATIC
30	-
31	#include "libavutil/avassert.h"
32	#include "libavutil/common.h"
33	#include "libavutil/imgutils.h"

Removed Link Here

(-)a/head/multimedia/ffmpeg/files/patch-kvazaar-0.7 (-73 lines)
1	From b3777b2c2eb5d04386992c0388985914d5bbebba Mon Sep 17 00:00:00 2001
2	From: =?UTF-8?q?Arttu=20Yl=C3=A4-Outinen?= <arttu.yla-outinen@tut.fi>
3	Date: Mon, 28 Sep 2015 10:55:14 +0300
4	Subject: libkvazaar: Update to work with the latest version
5	MIME-Version: 1.0
6	Content-Type: text/plain; charset=UTF-8
7	Content-Transfer-Encoding: 8bit
8
9	Function encoder_encode in Kvazaar API was changed to have new output
10	parameters: source picture and frame info. Frame info is used to set the
11	keyframe flag and source picture is ignored.
12
13	Signed-off-by: Arttu Ylä-Outinen <arttu.yla-outinen@tut.fi>
14	---
15	libavcodec/libkvazaar.c \| 16 +++++++++++++++-
16	1 file changed, 15 insertions(+), 1 deletion(-)
17
18	diff --git configure configure
19	index 4cc45ad..af3fbf4 100755
20	--- configure
21	+++ configure
22	@@ -5237,7 +5237,7 @@
23	check_lib "${gsm_hdr}" gsm_create -lgsm && break;
24	done \|\| die "ERROR: libgsm not found"; }
25	enabled libilbc && require libilbc ilbc.h WebRtcIlbcfix_InitDecode -lilbc
26	-enabled libkvazaar && require_pkg_config "kvazaar < 0.7.0" kvazaar.h kvz_api_get
27	+enabled libkvazaar && require_pkg_config "kvazaar >= 0.7.0" kvazaar.h kvz_api_get
28	enabled libmfx && require_pkg_config libmfx "mfx/mfxvideo.h" MFXInit
29	enabled libmodplug && require_pkg_config libmodplug libmodplug/modplug.h ModPlug_Load
30	enabled libmp3lame && require "libmp3lame >= 3.98.3" lame/lame.h lame_set_VBR_quality -lmp3lame
31	diff --git libavcodec/libkvazaar.c libavcodec/libkvazaar.c
32	index 9fb5be7..7430e0a 100644
33	--- libavcodec/libkvazaar.c
34	+++ libavcodec/libkvazaar.c
35	@@ -137,8 +137,11 @@ static int libkvazaar_encode(AVCodecContext *avctx,
36	{
37	int retval = 0;
38	kvz_picture *img_in = NULL;
39	+
40	kvz_data_chunk *data_out = NULL;
41	uint32_t len_out = 0;
42	+ kvz_frame_info frame_info;
43	+
44	LibkvazaarContext *ctx = avctx->priv_data;
45
46	*got_packet_ptr = 0;
47	@@ -173,7 +176,10 @@ static int libkvazaar_encode(AVCodecContext *avctx,
48	}
49	}
50
51	- if (!ctx->api->encoder_encode(ctx->encoder, img_in, &data_out, &len_out, NULL)) {
52	+ if (!ctx->api->encoder_encode(ctx->encoder, img_in,
53	+ &data_out, &len_out,
54	+ NULL, NULL,
55	+ &frame_info)) {
56	av_log(avctx, AV_LOG_ERROR, "Failed to encode frame.\n");
57	retval = AVERROR_EXTERNAL;
58	goto done;
59	@@ -198,6 +204,14 @@ static int libkvazaar_encode(AVCodecContext *avctx,
60
61	ctx->api->chunk_free(data_out);
62	data_out = NULL;
63	+
64	+ avpkt->flags = 0;
65	+ // IRAP VCL NAL unit types span the range
66	+ // [BLA_W_LP (16), RSV_IRAP_VCL23 (23)].
67	+ if (frame_info.nal_unit_type >= KVZ_NAL_BLA_W_LP &&
68	+ frame_info.nal_unit_type <= KVZ_NAL_RSV_IRAP_VCL23) {
69	+ avpkt->flags \|= AV_PKT_FLAG_KEY;
70	+ }
71	}
72
73	done:

Removed Link Here

(-)a/head/multimedia/ffmpeg/files/patch-libavfilter-vf_libopencv.c (-12 lines)
1	--- libavfilter/vf_libopencv.c.orig 2015-06-19 20:44:50 UTC
2	+++ libavfilter/vf_libopencv.c
3	@@ -23,8 +23,7 @@
4	* libopencv wrapper functions
5	*/
6
7	-#include <opencv/cv.h>
8	-#include <opencv/cxcore.h>
9	+#include <opencv2/imgproc/imgproc_c.h>
10	#include "libavutil/avstring.h"
11	#include "libavutil/common.h"
12	#include "libavutil/file.h"

Lines 3-14 Link Here

(-)b/head/multimedia/ffmpeg/pkg-plist (-24 / +32 lines)
3	bin/ffprobe	3	bin/ffprobe
4	%%FFSERVER%%bin/ffserver	4	%%FFSERVER%%bin/ffserver
5	%%FFSERVER%%@sample etc/ffserver.conf.sample	5	%%FFSERVER%%@sample etc/ffserver.conf.sample
		6	%%OPENCL%%include/libavutil/opencl.h
6	include/libavcodec/avcodec.h	7	include/libavcodec/avcodec.h
		8	include/libavcodec/avdct.h
7	include/libavcodec/avfft.h	9	include/libavcodec/avfft.h
8	include/libavcodec/d3d11va.h	10	include/libavcodec/d3d11va.h
		11	include/libavcodec/dirac.h
9	include/libavcodec/dv_profile.h	12	include/libavcodec/dv_profile.h
10	include/libavcodec/dxva2.h	13	include/libavcodec/dxva2.h
11	include/libavcodec/old_codec_ids.h	14	include/libavcodec/jni.h
12	include/libavcodec/qsv.h	15	include/libavcodec/qsv.h
13	include/libavcodec/vaapi.h	16	include/libavcodec/vaapi.h
14	include/libavcodec/vda.h	17	include/libavcodec/vda.h
Lines 19-26 Link Here
19	include/libavcodec/xvmc.h	22	include/libavcodec/xvmc.h
20	include/libavdevice/avdevice.h	23	include/libavdevice/avdevice.h
21	include/libavdevice/version.h	24	include/libavdevice/version.h
22	include/libavfilter/asrc_abuffer.h
23	include/libavfilter/avcodec.h
24	include/libavfilter/avfilter.h	25	include/libavfilter/avfilter.h
25	include/libavfilter/avfiltergraph.h	26	include/libavfilter/avfiltergraph.h
26	include/libavfilter/buffersink.h	27	include/libavfilter/buffersink.h
Lines 33-41 Link Here
33	include/libavresample/version.h	34	include/libavresample/version.h
34	include/libavutil/adler32.h	35	include/libavutil/adler32.h
35	include/libavutil/aes.h	36	include/libavutil/aes.h
		37	include/libavutil/aes_ctr.h
36	include/libavutil/attributes.h	38	include/libavutil/attributes.h
37	include/libavutil/audio_fifo.h	39	include/libavutil/audio_fifo.h
38	include/libavutil/audioconvert.h
39	include/libavutil/avassert.h	40	include/libavutil/avassert.h
40	include/libavutil/avconfig.h	41	include/libavutil/avconfig.h
41	include/libavutil/avstring.h	42	include/libavutil/avstring.h
Lines 51-56 Link Here
51	include/libavutil/common.h	52	include/libavutil/common.h
52	include/libavutil/cpu.h	53	include/libavutil/cpu.h
53	include/libavutil/crc.h	54	include/libavutil/crc.h
		55	include/libavutil/des.h
54	include/libavutil/dict.h	56	include/libavutil/dict.h
55	include/libavutil/display.h	57	include/libavutil/display.h
56	include/libavutil/downmix_info.h	58	include/libavutil/downmix_info.h
Lines 62-67 Link Here
62	include/libavutil/frame.h	64	include/libavutil/frame.h
63	include/libavutil/hash.h	65	include/libavutil/hash.h
64	include/libavutil/hmac.h	66	include/libavutil/hmac.h
		67	include/libavutil/hwcontext.h
		68	include/libavutil/hwcontext_cuda.h
		69	include/libavutil/hwcontext_dxva2.h
		70	include/libavutil/hwcontext_vaapi.h
		71	include/libavutil/hwcontext_vdpau.h
65	include/libavutil/imgutils.h	72	include/libavutil/imgutils.h
66	include/libavutil/intfloat.h	73	include/libavutil/intfloat.h
67	include/libavutil/intreadwrite.h	74	include/libavutil/intreadwrite.h
Lines 69-81 Link Here
69	include/libavutil/log.h	76	include/libavutil/log.h
70	include/libavutil/lzo.h	77	include/libavutil/lzo.h
71	include/libavutil/macros.h	78	include/libavutil/macros.h
		79	include/libavutil/mastering_display_metadata.h
72	include/libavutil/mathematics.h	80	include/libavutil/mathematics.h
73	include/libavutil/md5.h	81	include/libavutil/md5.h
74	include/libavutil/mem.h	82	include/libavutil/mem.h
75	include/libavutil/motion_vector.h	83	include/libavutil/motion_vector.h
76	include/libavutil/murmur3.h	84	include/libavutil/murmur3.h
77	include/libavutil/old_pix_fmts.h
78	%%OPENCL%%include/libavutil/opencl.h
79	include/libavutil/opt.h	85	include/libavutil/opt.h
80	include/libavutil/parseutils.h	86	include/libavutil/parseutils.h
81	include/libavutil/pixdesc.h	87	include/libavutil/pixdesc.h
Lines 83-88 Link Here
83	include/libavutil/pixfmt.h	89	include/libavutil/pixfmt.h
84	include/libavutil/random_seed.h	90	include/libavutil/random_seed.h
85	include/libavutil/rational.h	91	include/libavutil/rational.h
		92	include/libavutil/rc4.h
86	include/libavutil/replaygain.h	93	include/libavutil/replaygain.h
87	include/libavutil/ripemd.h	94	include/libavutil/ripemd.h
88	include/libavutil/samplefmt.h	95	include/libavutil/samplefmt.h
Lines 94-99 Link Here
94	include/libavutil/time.h	101	include/libavutil/time.h
95	include/libavutil/timecode.h	102	include/libavutil/timecode.h
96	include/libavutil/timestamp.h	103	include/libavutil/timestamp.h
		104	include/libavutil/tree.h
97	include/libavutil/twofish.h	105	include/libavutil/twofish.h
98	include/libavutil/version.h	106	include/libavutil/version.h
99	include/libavutil/xtea.h	107	include/libavutil/xtea.h
Lines 105-144 Link Here
105	include/libswscale/version.h	113	include/libswscale/version.h
106	lib/libavcodec.a	114	lib/libavcodec.a
107	lib/libavcodec.so	115	lib/libavcodec.so
108	lib/libavcodec.so.56	116	lib/libavcodec.so.57
109	lib/libavcodec.so.56.60.100	117	lib/libavcodec.so.57.48.101
110	lib/libavdevice.a	118	lib/libavdevice.a
111	lib/libavdevice.so	119	lib/libavdevice.so
112	lib/libavdevice.so.56	120	lib/libavdevice.so.57
113	lib/libavdevice.so.56.4.100	121	lib/libavdevice.so.57.0.101
114	lib/libavfilter.a	122	lib/libavfilter.a
115	lib/libavfilter.so	123	lib/libavfilter.so
116	lib/libavfilter.so.5	124	lib/libavfilter.so.6
117	lib/libavfilter.so.5.40.101	125	lib/libavfilter.so.6.47.100
118	lib/libavformat.a	126	lib/libavformat.a
119	lib/libavformat.so	127	lib/libavformat.so
120	lib/libavformat.so.56	128	lib/libavformat.so.57
121	lib/libavformat.so.56.40.101	129	lib/libavformat.so.57.41.100
122	lib/libavresample.a	130	lib/libavresample.a
123	lib/libavresample.so	131	lib/libavresample.so
124	lib/libavresample.so.2	132	lib/libavresample.so.3
125	lib/libavresample.so.2.1.0	133	lib/libavresample.so.3.0.0
126	lib/libavutil.a	134	lib/libavutil.a
127	lib/libavutil.so	135	lib/libavutil.so
128	lib/libavutil.so.54	136	lib/libavutil.so.55
129	lib/libavutil.so.54.31.100	137	lib/libavutil.so.55.28.100
130	lib/libpostproc.a	138	lib/libpostproc.a
131	lib/libpostproc.so	139	lib/libpostproc.so
132	lib/libpostproc.so.53	140	lib/libpostproc.so.54
133	lib/libpostproc.so.53.3.100	141	lib/libpostproc.so.54.0.100
134	lib/libswresample.a	142	lib/libswresample.a
135	lib/libswresample.so	143	lib/libswresample.so
136	lib/libswresample.so.1	144	lib/libswresample.so.2
137	lib/libswresample.so.1.2.101	145	lib/libswresample.so.2.1.100
138	lib/libswscale.a	146	lib/libswscale.a
139	lib/libswscale.so	147	lib/libswscale.so
140	lib/libswscale.so.3	148	lib/libswscale.so.4
141	lib/libswscale.so.3.1.101	149	lib/libswscale.so.4.1.100
142	libdata/pkgconfig/libavcodec.pc	150	libdata/pkgconfig/libavcodec.pc
143	libdata/pkgconfig/libavdevice.pc	151	libdata/pkgconfig/libavdevice.pc
144	libdata/pkgconfig/libavfilter.pc	152	libdata/pkgconfig/libavfilter.pc