Update ffmpeg3 and ffplay3 to 3.1.1

Changelog:
version 3.1.1:
- doc/APIchanges: document the lavu/lavf field moves
- avformat/avformat: Move new field to the end of AVStream
- avformat/utils: update deprecated AVStream->codec when the context is updated
- avutil/frame: Move new field to the end of AVFrame
- libavcodec/exr : fix decoding piz float file.
- avformat/mov: Check sample size
- lavfi: Move new field to the end of AVFilterContext
- lavfi: Move new field to the end of AVFilterLink
- ffplay: Fix usage of private lavfi API
- lavc/mediacodecdec_h264: add missing NAL headers to SPS/PPS buffers
- lavc/pnm_parser: disable parsing for text based PNMs


version 3.1:
- DXVA2-accelerated HEVC Main10 decoding
- fieldhint filter
- loop video filter and aloop audio filter
- Bob Weaver deinterlacing filter
- firequalizer filter
- datascope filter
- bench and abench filters
- ciescope filter
- protocol blacklisting API
- MediaCodec H264 decoding
- VC-2 HQ RTP payload format (draft v1) depacketizer and packetizer
- VP9 RTP payload format (draft v2) packetizer
- AudioToolbox audio decoders
- AudioToolbox audio encoders
- coreimage filter (GPU based image filtering on OSX)
- libdcadec removed
- bitstream filter for extracting DTS core
- ADPCM IMA DAT4 decoder
- musx demuxer
- aix demuxer
- remap filter
- hash and framehash muxers
- colorspace filter
- hdcd filter
- readvitc filter
- VAAPI-accelerated format conversion and scaling
- libnpp/CUDA-accelerated format conversion and scaling
- Duck TrueMotion 2.0 Real Time decoder
- Wideband Single-bit Data (WSD) demuxer
- VAAPI-accelerated H.264/HEVC/MJPEG encoding
- DTS Express (LBR) decoder
- Generic OpenMAX IL encoder with support for Raspberry Pi
- IFF ANIM demuxer & decoder
- Direct Stream Transfer (DST) decoder
- loudnorm filter
- MTAF demuxer and decoder
- MagicYUV decoder
- OpenExr improvements (tile data and B44/B44A support)
- BitJazz SheerVideo decoder
- CUDA CUVID H264/HEVC decoder
- 10-bit depth support in native utvideo decoder
- libutvideo wrapper removed
- YUY2 Lossless Codec decoder
- VideoToolbox H.264 encoder

4 files changed, 22 insertions, 17 deletions

diff --git a/multimedia/ffmpeg3/Makefile b/multimedia/ffmpeg3/Makefile
index 08f88fc0476..243ebf6ea5c 100644
--- a/multimedia/ffmpeg3/Makefile
+++ b/multimedia/ffmpeg3/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.7 2016/06/23 11:25:48 maya Exp $
+# $NetBSD: Makefile,v 1.8 2016/07/02 12:30:16 ryoon Exp $
 
 PKGNAME=	${DISTNAME:S/ffmpeg/ffmpeg3/}
-PKGREVISION=	2
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://ffmpeg.mplayerhq.hu/
 COMMENT=	Decoding, encoding and streaming software (v3.x)
diff --git a/multimedia/ffmpeg3/Makefile.common b/multimedia/ffmpeg3/Makefile.common
index f919ff19898..9d3d4067ca1 100644
--- a/multimedia/ffmpeg3/Makefile.common
+++ b/multimedia/ffmpeg3/Makefile.common
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile.common,v 1.6 2016/05/05 07:03:47 leot Exp $
+# $NetBSD: Makefile.common,v 1.7 2016/07/02 12:30:16 ryoon Exp $
 # used by multimedia/ffmpeg3/Makefile
 # used by multimedia/ffplay3/Makefile
 
-DISTNAME=	ffmpeg-3.0.2
+DISTNAME=	ffmpeg-3.1.1
 CATEGORIES=	multimedia
 MASTER_SITES=	http://www.ffmpeg.org/releases/
-EXTRACT_SUFX=	.tar.xz
+EXTRACT_SUFX=	.tar.bz2
 
 LICENSE=	gnu-lgpl-v2.1 AND gnu-gpl-v2
 
diff --git a/multimedia/ffmpeg3/PLIST b/multimedia/ffmpeg3/PLIST
index 3a01d5dfe2a..3a071815e70 100644
--- a/multimedia/ffmpeg3/PLIST
+++ b/multimedia/ffmpeg3/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2016/05/05 07:03:47 leot Exp $
+@comment $NetBSD: PLIST,v 1.5 2016/07/02 12:30:16 ryoon Exp $
 bin/ffmpeg3
 bin/ffprobe3
 bin/ffserver3
@@ -9,6 +9,7 @@ include/ffmpeg3/libavcodec/d3d11va.h
 include/ffmpeg3/libavcodec/dirac.h
 include/ffmpeg3/libavcodec/dv_profile.h
 include/ffmpeg3/libavcodec/dxva2.h
+include/ffmpeg3/libavcodec/jni.h
 include/ffmpeg3/libavcodec/qsv.h
 include/ffmpeg3/libavcodec/vaapi.h
 include/ffmpeg3/libavcodec/vda.h
@@ -59,6 +60,11 @@ include/ffmpeg3/libavutil/file.h
 include/ffmpeg3/libavutil/frame.h
 include/ffmpeg3/libavutil/hash.h
 include/ffmpeg3/libavutil/hmac.h
+include/ffmpeg3/libavutil/hwcontext.h
+include/ffmpeg3/libavutil/hwcontext_cuda.h
+include/ffmpeg3/libavutil/hwcontext_dxva2.h
+include/ffmpeg3/libavutil/hwcontext_vaapi.h
+include/ffmpeg3/libavutil/hwcontext_vdpau.h
 include/ffmpeg3/libavutil/imgutils.h
 include/ffmpeg3/libavutil/intfloat.h
 include/ffmpeg3/libavutil/intreadwrite.h
@@ -105,7 +111,7 @@ include/ffmpeg3/libswscale/version.h
 lib/ffmpeg3/libavcodec.a
 lib/ffmpeg3/libavcodec.so
 lib/ffmpeg3/libavcodec.so.57
-lib/ffmpeg3/libavcodec.so.57.24.102
+lib/ffmpeg3/libavcodec.so.57.48.101
 lib/ffmpeg3/libavdevice.a
 lib/ffmpeg3/libavdevice.so
 lib/ffmpeg3/libavdevice.so.57
@@ -113,15 +119,15 @@ lib/ffmpeg3/libavdevice.so.57.0.101
 lib/ffmpeg3/libavfilter.a
 lib/ffmpeg3/libavfilter.so
 lib/ffmpeg3/libavfilter.so.6
-lib/ffmpeg3/libavfilter.so.6.31.100
+lib/ffmpeg3/libavfilter.so.6.47.100
 lib/ffmpeg3/libavformat.a
 lib/ffmpeg3/libavformat.so
 lib/ffmpeg3/libavformat.so.57
-lib/ffmpeg3/libavformat.so.57.25.100
+lib/ffmpeg3/libavformat.so.57.41.100
 lib/ffmpeg3/libavutil.a
 lib/ffmpeg3/libavutil.so
 lib/ffmpeg3/libavutil.so.55
-lib/ffmpeg3/libavutil.so.55.17.103
+lib/ffmpeg3/libavutil.so.55.28.100
 lib/ffmpeg3/libpostproc.a
 lib/ffmpeg3/libpostproc.so
 lib/ffmpeg3/libpostproc.so.54
@@ -129,11 +135,11 @@ lib/ffmpeg3/libpostproc.so.54.0.100
 lib/ffmpeg3/libswresample.a
 lib/ffmpeg3/libswresample.so
 lib/ffmpeg3/libswresample.so.2
-lib/ffmpeg3/libswresample.so.2.0.101
+lib/ffmpeg3/libswresample.so.2.1.100
 lib/ffmpeg3/libswscale.a
 lib/ffmpeg3/libswscale.so
 lib/ffmpeg3/libswscale.so.4
-lib/ffmpeg3/libswscale.so.4.0.100
+lib/ffmpeg3/libswscale.so.4.1.100
 lib/ffmpeg3/pkgconfig/libavcodec.pc
 lib/ffmpeg3/pkgconfig/libavdevice.pc
 lib/ffmpeg3/pkgconfig/libavfilter.pc
diff --git a/multimedia/ffmpeg3/distinfo b/multimedia/ffmpeg3/distinfo
index 2b860a7cbcf..6f158c1bb9f 100644
--- a/multimedia/ffmpeg3/distinfo
+++ b/multimedia/ffmpeg3/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.4 2016/04/29 19:26:25 adam Exp $
+$NetBSD: distinfo,v 1.5 2016/07/02 12:30:16 ryoon Exp $
 
-SHA1 (ffmpeg-3.0.2.tar.xz) = ac3341269fe89a41892e8696465b859e1f425213
-RMD160 (ffmpeg-3.0.2.tar.xz) = 5a72ee69e80fc6b8a0127648bd206b2a9bef85f8
-SHA512 (ffmpeg-3.0.2.tar.xz) = a784258412431ef867372d24873f14d25cdbf333425b700f6836810c250a9d8811398de31dd042031c48e409659881bf6f6d6bfa46d74e3146536274d5186a22
-Size (ffmpeg-3.0.2.tar.xz) = 7461808 bytes
+SHA1 (ffmpeg-3.1.1.tar.bz2) = 542e24c3a50a0ba7d3fb4fc3432459c63e2195ee
+RMD160 (ffmpeg-3.1.1.tar.bz2) = 1b2b8e480d7140e43ff6f61ac4b05f2234b5681a
+SHA512 (ffmpeg-3.1.1.tar.bz2) = b5b4b2d518affa708b05f72201d5ac20446c88b5fb4dd8586cdc29d1132c678be94898e4f5ad27bef4ac987557305838133f45e94ff55d65f22a76f4f312888a
+Size (ffmpeg-3.1.1.tar.bz2) = 9327512 bytes
 SHA1 (patch-Makefile) = e3cb5cedccd2840f36ab90cd2f4b7987e1098a56
 SHA1 (patch-configure) = e57e2501e63a05e9eeefc688e311a16729d1a711
 SHA1 (patch-doc_Makefile) = 50ee7aaf74f8a5c439b11f141b5408322659543a