update to FFmpeg 4.4.1, from Brad.

graphics/ffmpeg/Makefile

@@ -1,10 +1,9 @@
-# $OpenBSD: Makefile,v 1.214 2021/09/10 21:47:55 sthen Exp $
+# $OpenBSD: Makefile,v 1.215 2021/11/08 12:41:51 sthen Exp $
 
 COMMENT=	audio/video converter and streamer
 
-V=		4.4
+V=		4.4.1
 DISTNAME=	ffmpeg-${V}
-REVISION=	4
 EPOCH=		1
 CATEGORIES=	graphics multimedia
 MASTER_SITES=	https://ffmpeg.org/releases/

graphics/ffmpeg/distinfo

@@ -1,2 +1,2 @@
-SHA256 (ffmpeg-4.4.tar.xz) = BrEKGDzlNx+RXGuxW3sf/74EboJ1CZyWr/wp4XZF2Qk=
-SIZE (ffmpeg-4.4.tar.xz) = 9557868
+SHA256 (ffmpeg-4.4.1.tar.xz) = 6tutnpqzCyX1Ug+/3pn65KkqGuPAJXqNaFaaRlHjDgI=
+SIZE (ffmpeg-4.4.1.tar.xz) = 9557516

graphics/ffmpeg/patches/patch-configure

@@ -1,4 +1,4 @@
-$OpenBSD: patch-configure,v 1.68 2021/08/10 21:32:07 sthen Exp $
+$OpenBSD: patch-configure,v 1.69 2021/11/08 12:41:51 sthen Exp $
 
 Index: configure
 --- configure.orig
@@ -20,7 +20,7 @@ Index: configure
  fast_clz_if_any="aarch64 alpha avr32 mips ppc x86"
  fast_unaligned_if_any="aarch64 ppc x86"
  simd_align_16_if_any="altivec neon sse"
-@@ -4914,6 +4915,9 @@ case "$arch" in
+@@ -4915,6 +4916,9 @@ case "$arch" in
      "Power Macintosh"|ppc*|powerpc*)
          arch="ppc"
      ;;
@@ -30,7 +30,7 @@ Index: configure
      s390|s390x)
          arch="s390"
      ;;
-@@ -5305,6 +5309,10 @@ case "$arch" in
+@@ -5306,6 +5310,10 @@ case "$arch" in
          check_64bit ppc ppc64
          enabled shared && enable_weak pic
      ;;
@@ -41,7 +41,7 @@ Index: configure
      s390)
          check_64bit s390 s390x
          enabled shared && enable_weak pic
-@@ -5377,7 +5385,6 @@ case $target_os in
+@@ -5378,7 +5386,6 @@ case $target_os in
          enable section_data_rel_ro
          striptype=""
          SHFLAGS='-shared'
@@ -49,7 +49,7 @@ Index: configure
          SLIB_INSTALL_LINKS=
          oss_indev_extralibs="-lossaudio"
          oss_outdev_extralibs="-lossaudio"
-@@ -5733,7 +5740,7 @@ set_default libdir
+@@ -5734,7 +5741,7 @@ set_default libdir
  set_default $PATHS_LIST
  set_default nm
  
@@ -58,7 +58,7 @@ Index: configure
  
  enable_weak_pic() {
      disabled pic && return
-@@ -6649,7 +6656,8 @@ enabled alsa && { check_pkg_config alsa alsa "alsa/aso
+@@ -6650,7 +6657,8 @@ enabled alsa && { check_pkg_config alsa alsa "alsa/aso
  enabled libjack &&
      require_pkg_config libjack jack jack/jack.h jack_port_get_latency_range
  

graphics/ffmpeg/patches/patch-libavutil_cpu_c

@@ -1,18 +0,0 @@
-$OpenBSD: patch-libavutil_cpu_c,v 1.2 2021/04/29 03:57:55 rsadowski Exp $
-
-Index: libavutil/cpu.c
---- libavutil/cpu.c.orig
-+++ libavutil/cpu.c
-@@ -291,6 +291,12 @@ int av_cpu_count(void)
-     DWORD_PTR proc_aff, sys_aff;
-     if (GetProcessAffinityMask(GetCurrentProcess(), &proc_aff, &sys_aff))
-         nb_cpus = av_popcount64(proc_aff);
-+#elif HAVE_SYSCTL && defined(HW_NCPUONLINE)
-+    int mib[2] = { CTL_HW, HW_NCPUONLINE };
-+    size_t len = sizeof(nb_cpus);
-+
-+    if (sysctl(mib, 2, &nb_cpus, &len, NULL, 0) == -1)
-+        nb_cpus = 0;
- #elif HAVE_SYSCTL && defined(HW_NCPU)
-     int mib[2] = { CTL_HW, HW_NCPU };
-     size_t len = sizeof(nb_cpus);