Index: branches/2017Q1/multimedia/ffmpeg/Makefile =================================================================== --- branches/2017Q1/multimedia/ffmpeg/Makefile (revision 433976) +++ branches/2017Q1/multimedia/ffmpeg/Makefile (revision 433977) @@ -1,490 +1,489 @@ # Created by: Martin Matuska # $FreeBSD$ PORTNAME= ffmpeg -PORTVERSION= 3.2.2 -PORTREVISION= 6 +PORTVERSION= 3.2.4 PORTEPOCH= 1 CATEGORIES= multimedia audio ipv6 net MASTER_SITES= http://ffmpeg.org/releases/ MAINTAINER= multimedia@FreeBSD.org COMMENT= Realtime audio/video encoder/converter and streaming server LICENSE= GPLv2+ LGPL21+ LICENSE_COMB= multi BUILD_DEPENDS= yasm:devel/yasm \ ${LOCALBASE}/bin/as:devel/binutils HAS_CONFIGURE= yes USES= compiler:c11 cpe gmake localbase:ldflags perl5 \ pkgconfig shebangfix tar:bzip2 USE_LDCONFIG= yes USE_PERL5= build SHEBANG_FILES= doc/texi2pod.pl NOPRECIOUSMAKEVARS= yes # ARCH PORTSCOUT= limit:^3\. OPTIONS_DEFINE= ALSA AMR_NB AMR_WB ASS BS2B CACA CDIO CELT CHROMAPRINT DC1394 \ DEBUG DOCS EBUR128 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 SNDIO SOXR 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 GMP GNUTLS ICONV \ OPENCV OPTIMIZED_CFLAGS RTCPU SCHROEDINGER THEORA V4L VAAPI VDPAU \ - VORBIS VPX X264 XVID + VORBIS VPX X264 X265 XVID OPTIONS_RADIO= RTMP SSL OPTIONS_RADIO_RTMP= GCRYPT GMP LIBRTMP OPTIONS_RADIO_SSL= GNUTLS OPENSSL OPTIONS_GROUP= LICENSE OPTIONS_GROUP_LICENSE= GPL3 NONFREE OPTIONS_DEFINE_amd64= MMX SSE OPTIONS_DEFINE_armv6= VFP NEON OPTIONS_DEFINE_armv6hf= VFP NEON OPTIONS_DEFINE_i386= MMX SSE OPTIONS_DEFAULT_amd64= MMX SSE OPTIONS_DEFAULT_i386= MMX SSE 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 EBUR128_DESC= EBU R128 measurement for loudnorm filter FDK_AAC_DESC= AAC audio encoding via Fraunhofer FDK FFSERVER_DESC= Build and install ffserver FLITE_DESC= Voice synthesis support via libflite GME_DESC= Game Music Emu demuxer GPL3_DESC= Allow (L)GPL version 3 code(cs) ILBC_DESC= Internet Low Bit Rate codec 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 RTMP_DESC= RTMP(T)E protocol support LIBRTMP_DESC= ${RTMP_DESC} 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 # alsa ALSA_CONFIGURE_OFF= --disable-indev=alsa \ --disable-outdev=alsa ALSA_LIB_DEPENDS= libasound.so:audio/alsa-lib # Opencore AMR NB AMR_NB_LIB_DEPENDS= libopencore-amrnb.so:audio/opencore-amr AMR_NB_CONFIGURE_ENABLE= libopencore-amrnb AMR_NB_IMPLIES= GPL3 # Opencore AMR WB AMR_WB_LIB_DEPENDS= libopencore-amrwb.so:audio/opencore-amr AMR_WB_CONFIGURE_ENABLE= libopencore-amrwb AMR_WB_IMPLIES= GPL3 # ass ASS_LIB_DEPENDS= libass.so:multimedia/libass ASS_CONFIGURE_ENABLE= libass # bs2b BS2B_LIB_DEPENDS= libbs2b.so:audio/libbs2b BS2B_CONFIGURE_ENABLE= libbs2b # caca CACA_LIB_DEPENDS= libcaca.so:graphics/libcaca CACA_CONFIGURE_ENABLE= libcaca # cdio CDIO_LIB_DEPENDS= libcdio_paranoia.so:sysutils/libcdio-paranoia CDIO_CONFIGURE_ENABLE= libcdio # celt 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 # debugging DEBUG_CONFIGURE_ON= --disable-stripping DEBUG_CONFIGURE_OFF= --disable-debug # docs DOCS_BUILD_DEPENDS= texi2html:textproc/texi2html DOCS_CONFIGURE_ENABLE= htmlpages # ebur128 EBUR128_LIB_DEPENDS= libebur128.so:audio/libebur128 EBUR128_CONFIGURE_ENABLE= libebur128 # fdk_aac FDK_AAC_LIB_DEPENDS= libfdk-aac.so:audio/fdk-aac FDK_AAC_CONFIGURE_ENABLE= libfdk-aac FDK_AAC_IMPLIES= NONFREE # ffserver FFSERVER_CONFIGURE_ENABLE= ffserver FFSERVER_VARS= USE_RC_SUBR+=ffserver # flite FLITE_LIB_DEPENDS= libflite.so:audio/flite FLITE_CONFIGURE_ENABLE= libflite # fontconfig FONTCONFIG_LIB_DEPENDS= libfontconfig.so:x11-fonts/fontconfig FONTCONFIG_CONFIGURE_ENABLE= fontconfig # freetype FREETYPE_LIB_DEPENDS= libfreetype.so:print/freetype2 FREETYPE_CONFIGURE_ENABLE= libfreetype # frei0r FREI0R_BUILD_DEPENDS= ${LOCALBASE}/include/frei0r.h:graphics/frei0r FREI0R_CONFIGURE_ENABLE= frei0r # fribidi 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 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 # iconv ICONV_USES= iconv ICONV_CONFIGURE_ENABLE= iconv # ilbc ILBC_LIB_DEPENDS= libilbc.so:net/libilbc ILBC_CONFIGURE_ENABLE= libilbc # jack JACK_LIB_DEPENDS= libjack.so:audio/jack JACK_CONFIGURE_OFF= --disable-indev=jack # kvazaar KVAZAAR_LIB_DEPENDS= libkvazaar.so:multimedia/kvazaar KVAZAAR_CONFIGURE_ENABLE= libkvazaar # ladspa LADSPA_BUILD_DEPENDS= ${LOCALBASE}/include/ladspa.h:audio/ladspa LADSPA_RUN_DEPENDS= ${LOCALBASE}/lib/ladspa/amp.so:audio/ladspa LADSPA_CONFIGURE_ENABLE= ladspa # lame LAME_LIB_DEPENDS= libmp3lame.so:audio/lame LAME_CONFIGURE_ENABLE= libmp3lame # libbluray LIBBLURAY_LIB_DEPENDS= libbluray.so:multimedia/libbluray LIBBLURAY_CONFIGURE_ENABLE= libbluray # libv4l V4L_BUILD_DEPENDS= v4l_compat>0:multimedia/v4l_compat V4L_LIB_DEPENDS= libv4l2.so:multimedia/libv4l V4L_CONFIGURE_ENABLE= libv4l2 V4L_CONFIGURE_OFF= --disable-indev=v4l2 \ --disable-outdev=v4l2 # mmx support MMX_CONFIGURE_ENABLE= mmx # modplug 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 OPENAL_CONFIGURE_OFF= --disable-indev=openal # opencl OPENCL_BUILD_DEPENDS= ${LOCALBASE}/include/CL/opencl.h:devel/opencl OPENCL_LIB_DEPENDS= libOpenCL.so:devel/ocl-icd OPENCL_CONFIGURE_ENABLE= opencl # opencv OPENCV_LIB_DEPENDS= libopencv_imgproc.so:graphics/opencv2-core OPENCV_CONFIGURE_ENABLE= libopencv # opengl OPENGL_USE= GL=gl OPENGL_CONFIGURE_ENABLE= opengl # openh264 OPENH264_LIB_DEPENDS= libopenh264.so:multimedia/openh264 OPENH264_CONFIGURE_ENABLE= libopenh264 # openjpeg OPENJPEG_LIB_DEPENDS= libopenjp2.so:graphics/openjpeg OPENJPEG_CONFIGURE_ENABLE= libopenjpeg # openssl OPENSSL_USE= OPENSSL=yes OPENSSL_CONFIGURE_ENABLE= openssl OPENSSL_IMPLIES= NONFREE # optimizations OPTIMIZED_CFLAGS_CONFIGURE_ENABLE= optimizations # opus OPUS_LIB_DEPENDS= libopus.so:audio/opus OPUS_CONFIGURE_ENABLE= libopus # pulseaudio PULSEAUDIO_LIB_DEPENDS= libpulse.so:audio/pulseaudio PULSEAUDIO_CONFIGURE_ENABLE= libpulse 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 SCHROEDINGER_CONFIGURE_ENABLE= libschroedinger # sdl SDL_USE= SDL=sdl2 SDL_CONFIGURE_ENABLE= ffplay SDL_CONFIGURE_OFF= --disable-outdev=sdl --disable-sdl2 # smbclient SMB_LIB_DEPENDS= libsmbclient.so:net/samba-libsmbclient SMB_CONFIGURE_ENABLE= libsmbclient SMB_IMPLIES= GPL3 # snappy SNAPPY_LIB_DEPENDS= libsnappy.so:archivers/snappy SNAPPY_CONFIGURE_ENABLE= libsnappy # sndio SNDIO_CONFIGURE_OFF= --disable-indev=sndio \ --disable-outdev=sndio SNDIO_LIB_DEPENDS= libsndio.so:audio/sndio # soxr SOXR_LIB_DEPENDS= libsoxr.so:audio/libsoxr SOXR_CONFIGURE_ENABLE= libsoxr # speex SPEEX_LIB_DEPENDS= libspeex.so:audio/speex SPEEX_CONFIGURE_ENABLE= libspeex # sse support SSE_CONFIGURE_ENABLE= sse SSE_IMPLIES= MMX # ssh 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 # twolame TWOLAME_LIB_DEPENDS= libtwolame.so:audio/twolame TWOLAME_CONFIGURE_ENABLE= libtwolame # vaapi VAAPI_LIB_DEPENDS= libva.so:multimedia/libva VAAPI_CONFIGURE_ENABLE= vaapi # vdpau VDPAU_LIB_DEPENDS= libvdpau.so:multimedia/libvdpau VDPAU_CONFIGURE_ENABLE= vdpau # armv6 VFP_CONFIGURE_ENABLE= vfp NEON_CONFIGURE_ENABLE= neon .if ! ${CFLAGS:M-march*} NEON_CONFIGURE_ON= --cpu=armv7-a .endif # vo-amrwbenc VO_AMRWBENC_LIB_DEPENDS= libvo-amrwbenc.so:audio/vo-amrwbenc VO_AMRWBENC_CONFIGURE_ENABLE= libvo-amrwbenc VO_AMRWBENC_IMPLIES= GPL3 # vid.stab VIDSTAB_LIB_DEPENDS= libvidstab.so:multimedia/vid.stab VIDSTAB_CONFIGURE_ENABLE= libvidstab # vorbis VORBIS_LIB_DEPENDS= libvorbisenc.so:audio/libvorbis VORBIS_CONFIGURE_ENABLE= libvorbis # vp8 VPX_LIB_DEPENDS= libvpx.so:multimedia/libvpx VPX_CONFIGURE_ENABLE= libvpx # wavpack WAVPACK_LIB_DEPENDS= libwavpack.so:audio/wavpack WAVPACK_CONFIGURE_ENABLE= libwavpack # webp WEBP_LIB_DEPENDS= libwebp.so:graphics/webp WEBP_CONFIGURE_ENABLE= libwebp # x11grab X11GRAB_USE= XORG=x11,xext,xfixes X11GRAB_CONFIGURE_ENABLE= x11grab # x264 X264_LIB_DEPENDS= libx264.so:multimedia/libx264 X264_CONFIGURE_ENABLE= libx264 # x265 X265_LIB_DEPENDS= libx265.so:multimedia/x265 X265_CONFIGURE_ENABLE= libx265 # xcb XCB_USE= XORG=xcb XCB_CONFIGURE_ENABLE= libxcb # xvid XVID_LIB_DEPENDS= libxvidcore.so:multimedia/xvid XVID_CONFIGURE_ENABLE= libxvid # xv 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 ZMQ_VERSION?= 4 # zvbi ZVBI_LIB_DEPENDS= libzvbi.so:devel/libzvbi ZVBI_CONFIGURE_ENABLE= libzvbi # License knobs GPL3_CONFIGURE_ENABLE= version3 GPL3_VARS= LICENSE="GPLv3+ LGPL3+" LICENSE_FILE_GPLv3= ${WRKSRC}/COPYING.GPLv3 LICENSE_FILE_LGPL3= ${WRKSRC}/COPYING.LGPLv3 NONFREE_CONFIGURE_ENABLE=nonfree NONFREE_VARS= RESTRICTED="enabling OPENSSL or FDK_AAC restricts redistribution" INSTALL_TARGET= install-progs install-doc install-data \ install-libs install-headers DATADIR= ${PREFIX}/share/${PORTNAME}${PKGNAMESUFFIX} 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}" \ --pkgconfigdir="${PREFIX}/libdata/pkgconfig" \ --enable-shared \ --enable-gpl \ --enable-postproc \ --enable-avfilter \ --enable-avresample \ --enable-pthreads \ --cc="${CC}" CONFIGURE_ENV_armv6_clang= ASFLAGS=-no-integrated-as CONFIGURE_ARGS_armv6= --disable-fast-unaligned CONFIGURE_ARGS_FreeBSD_9= --enable-memalign-hack DOC_FILES= Changelog CREDITS INSTALL.md LICENSE.md MAINTAINERS \ README.md RELEASE_NOTES # under doc subdirectory DOC_DOCFILES= APIchanges *.txt PORTDOCS= * # Custom helpers. FOO_${ARCH} style from bsd.port.mk CONFIGURE_ENV+= ${CONFIGURE_ENV_${ARCH}_${CHOSEN_COMPILER_TYPE}} CONFIGURE_ARGS+=${CONFIGURE_ARGS_${OPSYS}_${OSREL:R}} CONFIGURE_ARGS+=${CONFIGURE_ARGS_${ARCH}} post-patch: # {C,LD}FLAGS safeness @${REINPLACE_CMD} -e 's|/etc/ffserver.conf|${PREFIX}/etc/ffserver.conf|' \ ${WRKSRC}/ffserver.c @${REINPLACE_CMD} -E \ -e 's|require_pkg_config opencv|require_pkg_config opencv-core|g' \ ${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT} post-install: (cd ${WRKSRC} && ${COPYTREE_SHARE} \ "${DOC_FILES}" ${STAGEDIR}${DOCSDIR}) (cd ${WRKSRC}/doc && ${COPYTREE_SHARE} \ "${DOC_DOCFILES}" ${STAGEDIR}${DOCSDIR}) post-install-FFSERVER-on: ${INSTALL_DATA} ${WRKSRC}/doc/ffserver.conf \ ${STAGEDIR}${PREFIX}/etc/ffserver.conf.sample .include Index: branches/2017Q1/multimedia/ffmpeg/distinfo =================================================================== --- branches/2017Q1/multimedia/ffmpeg/distinfo (revision 433976) +++ branches/2017Q1/multimedia/ffmpeg/distinfo (revision 433977) @@ -1,3 +1,3 @@ -TIMESTAMP = 1480980538 -SHA256 (ffmpeg-3.2.2.tar.bz2) = 0b129a56d1b8d06101b1fcbfaa9f4f5eee3182d1ad6e44f511a84c12113a366b -SIZE (ffmpeg-3.2.2.tar.bz2) = 9611373 +TIMESTAMP = 1486896628 +SHA256 (ffmpeg-3.2.4.tar.bz2) = c0fa3593a2e9e96ace3c1757900094437ad96d1d6ca19f057c378b5f394496a4 +SIZE (ffmpeg-3.2.4.tar.bz2) = 9612274 Index: branches/2017Q1/multimedia/ffmpeg/files/patch-ffserver__config.c =================================================================== --- branches/2017Q1/multimedia/ffmpeg/files/patch-ffserver__config.c (revision 433976) +++ branches/2017Q1/multimedia/ffmpeg/files/patch-ffserver__config.c (nonexistent) @@ -1,22 +0,0 @@ -Author: Michael Niedermayer -Date: Tue Nov 29 18:48:40 2016 +0100 - - ffserver_config: Setup codecpar in add_codec() - - fixes segfault in the status page code - - Signed-off-by: Michael Niedermayer - -https://git.videolan.org/?p=ffmpeg.git;a=commitdiff;h=472fee91bcf9 - ---- ffserver_config.c.orig 2016-12-05 23:28:53 UTC -+++ ffserver_config.c -@@ -323,6 +323,8 @@ done: - av_dict_free(&recommended); - av_stream_set_recommended_encoder_configuration(st, enc_config); - st->codec = av; -+ st->codecpar = avcodec_parameters_alloc(); -+ avcodec_parameters_from_context(st->codecpar, av); - stream->streams[stream->nb_streams++] = st; - } - Property changes on: branches/2017Q1/multimedia/ffmpeg/files/patch-ffserver__config.c ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: branches/2017Q1/multimedia/ffmpeg/pkg-plist =================================================================== --- branches/2017Q1/multimedia/ffmpeg/pkg-plist (revision 433976) +++ branches/2017Q1/multimedia/ffmpeg/pkg-plist (revision 433977) @@ -1,209 +1,209 @@ bin/ffmpeg %%SDL%%bin/ffplay bin/ffprobe %%FFSERVER%%bin/ffserver %%FFSERVER%%@sample etc/ffserver.conf.sample 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/mediacodec.h include/libavcodec/qsv.h include/libavcodec/vaapi.h include/libavcodec/vda.h include/libavcodec/vdpau.h include/libavcodec/version.h include/libavcodec/videotoolbox.h include/libavcodec/vorbis_parser.h include/libavcodec/xvmc.h include/libavdevice/avdevice.h include/libavdevice/version.h include/libavfilter/avfilter.h include/libavfilter/avfiltergraph.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/aes_ctr.h include/libavutil/attributes.h include/libavutil/audio_fifo.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/camellia.h include/libavutil/cast5.h include/libavutil/channel_layout.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/error.h include/libavutil/eval.h include/libavutil/ffversion.h include/libavutil/fifo.h include/libavutil/file.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_qsv.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/lfg.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 %%OPENCL%%include/libavutil/opencl.h include/libavutil/opt.h include/libavutil/parseutils.h include/libavutil/pixdesc.h include/libavutil/pixelutils.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/sha.h include/libavutil/sha512.h include/libavutil/stereo3d.h include/libavutil/tea.h include/libavutil/threadmessage.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/libpostproc/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.57 lib/libavcodec.so.57.64.101 lib/libavdevice.a lib/libavdevice.so lib/libavdevice.so.57 lib/libavdevice.so.57.1.100 lib/libavfilter.a lib/libavfilter.so lib/libavfilter.so.6 lib/libavfilter.so.6.65.100 lib/libavformat.a lib/libavformat.so lib/libavformat.so.57 -lib/libavformat.so.57.56.100 +lib/libavformat.so.57.56.101 lib/libavresample.a lib/libavresample.so lib/libavresample.so.3 lib/libavresample.so.3.1.0 lib/libavutil.a lib/libavutil.so lib/libavutil.so.55 -lib/libavutil.so.55.34.100 +lib/libavutil.so.55.34.101 lib/libpostproc.a lib/libpostproc.so lib/libpostproc.so.54 lib/libpostproc.so.54.1.100 lib/libswresample.a lib/libswresample.so lib/libswresample.so.2 lib/libswresample.so.2.3.100 lib/libswscale.a lib/libswscale.so lib/libswscale.so.4 lib/libswscale.so.4.2.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-all.1.gz man/man1/ffmpeg-bitstream-filters.1.gz man/man1/ffmpeg-codecs.1.gz man/man1/ffmpeg-devices.1.gz man/man1/ffmpeg-filters.1.gz man/man1/ffmpeg-formats.1.gz man/man1/ffmpeg-protocols.1.gz man/man1/ffmpeg-resampler.1.gz man/man1/ffmpeg-scaler.1.gz man/man1/ffmpeg-utils.1.gz man/man1/ffmpeg.1.gz %%SDL%%man/man1/ffplay-all.1.gz %%SDL%%man/man1/ffplay.1.gz man/man1/ffprobe-all.1.gz man/man1/ffprobe.1.gz %%FFSERVER%%man/man1/ffserver-all.1.gz %%FFSERVER%%man/man1/ffserver.1.gz man/man3/libavcodec.3.gz man/man3/libavdevice.3.gz man/man3/libavfilter.3.gz man/man3/libavformat.3.gz man/man3/libavutil.3.gz man/man3/libswresample.3.gz man/man3/libswscale.3.gz %%DATADIR%%/examples/Makefile %%DATADIR%%/examples/README %%DATADIR%%/examples/avio_dir_cmd.c %%DATADIR%%/examples/avio_reading.c %%DATADIR%%/examples/decoding_encoding.c %%DATADIR%%/examples/demuxing_decoding.c %%DATADIR%%/examples/extract_mvs.c %%DATADIR%%/examples/filter_audio.c %%DATADIR%%/examples/filtering_audio.c %%DATADIR%%/examples/filtering_video.c %%DATADIR%%/examples/http_multiclient.c %%DATADIR%%/examples/metadata.c %%DATADIR%%/examples/muxing.c %%DATADIR%%/examples/qsvdec.c %%DATADIR%%/examples/remuxing.c %%DATADIR%%/examples/resampling_audio.c %%DATADIR%%/examples/scaling_video.c %%DATADIR%%/examples/transcode_aac.c %%DATADIR%%/examples/transcoding.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 Index: branches/2017Q1 =================================================================== --- branches/2017Q1 (revision 433976) +++ branches/2017Q1 (revision 433977) Property changes on: branches/2017Q1 ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head:r433759,433937