ffmpeg5 ffplay5: updated to 5.1.2

version 5.1.2:
- avcodec/dstdec: Check for overflow in build_filter()
- avformat/spdifdec: Use 64bit to compute bit rate
- avformat/rpl: Use 64bit for duration computation
- avformat/xwma: Use av_rescale() for duration computation
- avformat/sdsdec: Use av_rescale() to avoid intermediate overflow in duration calculation
- avformat/sbgdec: Check ts_int in genrate_intervals
- avformat/sbgdec: clamp end_ts
- avformat/rmdec: check tag_size
- avformat/nutdec: Check fields
- avformat/flvdec: Use 64bit for sum_flv_tag_size
- avformat/jacosubdec: Fix overflow in get_shift()
- avformat/genh: Check nb_channels for IMA ADPCM
- avformat/dxa: avoid bpc overflows
- avformat/dhav: Use 64bit seek_back
- avformat/cafdec: Check that nb_frasmes fits within 64bit
- avformat/asfdec_o: Limit packet offset
- avformat/apm: Use 64bit for bit_rate computation
- avformat/ape: Check frames size
- avformat/icodec: Check nb_pal
- avformat/aiffdec: Use 64bit for block_duration use
- avformat/aiffdec: Check block_duration
- avformat/mxfdec: only probe max run in
- avformat/mxfdec: Check run_in is within 65536
- avcodec/mjpegdec: Check for unsupported bayer case
- avcodec/apedec: Fix integer overflow in filter_3800()
- avcodec/tta: Check 24bit scaling for overflow
- avcodec/mobiclip: Check quantizer for overflow
- avcodec/exr: Check preview psize
- avcodec/tiff: Fix loop detection
- libavformat/hls: Free keys
- avcodec/fmvc: Move frame allocation to a later stage
- avfilter/vf_showinfo: remove backspaces
- avcodec/speedhq: Check width
- avcodec/bink: disallow odd positioned scaled blocks
- avformat/cafenc: derive Opus frame size from the relevant stream parameters
- avformat/dashdec: Fix crash on invalid input/ENOMEM, fix leak
- lavc/videotoolbox: do not pass AVCodecContext to decoder output callback
- lavc/pthread_frame: always transfer stashed hwaccel state
- avcodec/arm/sbcenc: avoid callee preserved vfp registers
- avformat/riffdec: don't unconditionally overwrite WAVEFORMATEXTENSIBLE layout
- avfilter/vf_scale: overwrite the width and height expressions with the original values
- lavc/pthread_frame: avoid leaving stale hwaccel state in worker threads
- avutil/tests/.gitignore: Add channel_layout testtool

6 files changed, 13 insertions, 16 deletions

diff --git a/multimedia/ffmpeg5/Makefile b/multimedia/ffmpeg5/Makefile
index a8059e920a5..8091dadc7bf 100644
--- a/multimedia/ffmpeg5/Makefile
+++ b/multimedia/ffmpeg5/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.11 2022/09/11 12:52:01 wiz Exp $
+# $NetBSD: Makefile,v 1.12 2022/09/26 12:38:36 adam Exp $
 
 PKGNAME=	${DISTNAME:S/ffmpeg/ffmpeg5/}
-PKGREVISION=	1
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	https://ffmpeg.org/
 COMMENT=	Decoding, encoding and streaming software (v5.x)
diff --git a/multimedia/ffmpeg5/Makefile.common b/multimedia/ffmpeg5/Makefile.common
index 9f9f82f3144..26bebe4f549 100644
--- a/multimedia/ffmpeg5/Makefile.common
+++ b/multimedia/ffmpeg5/Makefile.common
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile.common,v 1.4 2022/09/01 07:26:44 adam Exp $
+# $NetBSD: Makefile.common,v 1.5 2022/09/26 12:38:36 adam Exp $
 # used by multimedia/ffmpeg5/Makefile
 # used by multimedia/ffplay5/Makefile
 
-DISTNAME=	ffmpeg-5.1.1
+DISTNAME=	ffmpeg-5.1.2
 CATEGORIES=	multimedia
 MASTER_SITES=	http://www.ffmpeg.org/releases/
 EXTRACT_SUFX=	.tar.xz
diff --git a/multimedia/ffmpeg5/buildlink3.mk b/multimedia/ffmpeg5/buildlink3.mk
index db267361eeb..d09bb7911b2 100644
--- a/multimedia/ffmpeg5/buildlink3.mk
+++ b/multimedia/ffmpeg5/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2022/07/25 00:50:12 tnn Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2022/09/26 12:38:36 adam Exp $
 
 BUILDLINK_TREE+=	ffmpeg5
 
@@ -34,7 +34,7 @@ pkgbase := ffmpeg5
 .endif
 
 .if ${PKG_BUILD_OPTIONS.ffmpeg5:Mx264}
-.  include "../../multimedia/x264-devel/buildlink3.mk"
+.  include "../../multimedia/x264/buildlink3.mk"
 .endif
 
 .if ${PKG_BUILD_OPTIONS.ffmpeg5:Mlibvpx}
diff --git a/multimedia/ffmpeg5/distinfo b/multimedia/ffmpeg5/distinfo
index 4602f309025..6be00c5dc35 100644
--- a/multimedia/ffmpeg5/distinfo
+++ b/multimedia/ffmpeg5/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.4 2022/09/01 07:26:44 adam Exp $
+$NetBSD: distinfo,v 1.5 2022/09/26 12:38:36 adam Exp $
 
-BLAKE2s (ffmpeg-5.1.1.tar.xz) = 7582aafb86a89ae09add8b487ec05157c099cdfd57f8e56ea79fd3322c6fdd32
-SHA512 (ffmpeg-5.1.1.tar.xz) = 689e38d1a18bfaa8709505bad0c07edabbf02b2f1477dcfcb2fed5e1a3adc654c8e82cb877a92e278c90521242c39ae7e0bbd41e6beb3651de0c96b113d97baa
-Size (ffmpeg-5.1.1.tar.xz) = 10001696 bytes
+BLAKE2s (ffmpeg-5.1.2.tar.xz) = 08bd1a9c02d5c168c2644fc9fcbf0db7dcdb6874a71ac1057ae4bd830733e1b6
+SHA512 (ffmpeg-5.1.2.tar.xz) = 04d9ae2a0e9238c469941d2bb9929d59b58f4be3830846cf91b02a440da17803a04b147a4e0168c9ffd6f62ca82187508bc7b53255de9787a97168278e903b9b
+Size (ffmpeg-5.1.2.tar.xz) = 10004956 bytes
 SHA1 (patch-Makefile) = 2d27f218ee49179fdea14bb5c86c506dfb64dbd6
 SHA1 (patch-configure) = b4dea315f65ab019eb78cee7f58d938382024ae0
 SHA1 (patch-doc_Makefile) = d45fc311f47e6cd8a8432659d7bd77e50b858e43
diff --git a/multimedia/ffmpeg5/options.mk b/multimedia/ffmpeg5/options.mk
index 47edac6764c..24e95b31a49 100644
--- a/multimedia/ffmpeg5/options.mk
+++ b/multimedia/ffmpeg5/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.2 2022/08/11 23:57:05 gutteridge Exp $
+# $NetBSD: options.mk,v 1.3 2022/09/26 12:38:36 adam Exp $
 
 # Global and legacy options
 
@@ -210,10 +210,9 @@ CONFIGURE_ARGS+=	--enable-libxvid
 
 # x264 support
 .if !empty(PKG_OPTIONS:Mx264)
-# ABI change between 20090326 and 20100201
-BUILDLINK_API_DEPENDS.x264-devel+=	x264-devel>=20111207
+BUILDLINK_API_DEPENDS.x264+=	x264>=20220601
 CONFIGURE_ARGS+=	--enable-libx264
-.include "../../multimedia/x264-devel/buildlink3.mk"
+.include "../../multimedia/x264/buildlink3.mk"
 .else
 CONFIGURE_ARGS+=	--disable-libx264
 .endif
diff --git a/multimedia/ffplay5/Makefile b/multimedia/ffplay5/Makefile
index 9b387909b2c..3a5a3767f90 100644
--- a/multimedia/ffplay5/Makefile
+++ b/multimedia/ffplay5/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.9 2022/09/11 12:52:01 wiz Exp $
+# $NetBSD: Makefile,v 1.10 2022/09/26 12:38:36 adam Exp $
 
 PKGNAME=	${DISTNAME:S/ffmpeg/ffplay5/}
-PKGREVISION=	1
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	https://ffmpeg.org/
 COMMENT=	Simple SDL frontend for FFmpeg