On Sun, Oct 24, 2021 at 09:35:11PM -0400, Brad Smith wrote:
> Here is an update to FFmpeg 4.4.1.
Hi Brad
Did you get a chance to look at the patch I sent some days ago fixing
multicasts (attached again)?
Thanks
>
> Index: Makefile
> ===================================================================
> RCS file: /home/cvs/ports/graphics/ffmpeg/Makefile,v
> retrieving revision 1.214
> diff -u -p -u -p -r1.214 Makefile
> --- Makefile 10 Sep 2021 21:47:55 -0000 1.214
> +++ Makefile 25 Oct 2021 01:17:10 -0000
> @@ -2,9 +2,8 @@
>
> 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/
> Index: distinfo
> ===================================================================
> RCS file: /home/cvs/ports/graphics/ffmpeg/distinfo,v
> retrieving revision 1.62
> diff -u -p -u -p -r1.62 distinfo
> --- distinfo 29 Apr 2021 03:57:54 -0000 1.62
> +++ distinfo 25 Oct 2021 01:17:44 -0000
> @@ -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
> Index: patches/patch-configure
> ===================================================================
> RCS file: /home/cvs/ports/graphics/ffmpeg/patches/patch-configure,v
> retrieving revision 1.68
> diff -u -p -u -p -r1.68 patch-configure
> --- patches/patch-configure 10 Aug 2021 21:32:07 -0000 1.68
> +++ patches/patch-configure 25 Sep 2021 08:39:49 -0000
> @@ -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
>
> Index: patches/patch-libavutil_cpu_c
> ===================================================================
> RCS file: patches/patch-libavutil_cpu_c
> diff -N patches/patch-libavutil_cpu_c
> --- patches/patch-libavutil_cpu_c 29 Apr 2021 03:57:55 -0000 1.2
> +++ /dev/null 1 Jan 1970 00:00:00 -0000
> @@ -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);
>
--
$OpenBSD$
Index: libavformat/udp.c
--- libavformat/udp.c.orig
+++ libavformat/udp.c
@@ -161,9 +161,10 @@ static const AVClass udplite_context_class = {
static int udp_set_multicast_ttl(int sockfd, int mcastTTL,
struct sockaddr *addr)
{
+ unsigned char mcastTTLc = mcastTTL;
#ifdef IP_MULTICAST_TTL
if (addr->sa_family == AF_INET) {
- if (setsockopt(sockfd, IPPROTO_IP, IP_MULTICAST_TTL, &mcastTTL,
sizeof(mcastTTL)) < 0) {
+ if (setsockopt(sockfd, IPPROTO_IP, IP_MULTICAST_TTL, &mcastTTLc,
sizeof(mcastTTLc)) < 0) {
ff_log_net_error(NULL, AV_LOG_ERROR,
"setsockopt(IP_MULTICAST_TTL)");
return ff_neterrno();
}
@@ -171,7 +172,7 @@ static int udp_set_multicast_ttl(int sockfd, int mcast
#endif
#if defined(IPPROTO_IPV6) && defined(IPV6_MULTICAST_HOPS)
if (addr->sa_family == AF_INET6) {
- if (setsockopt(sockfd, IPPROTO_IPV6, IPV6_MULTICAST_HOPS, &mcastTTL,
sizeof(mcastTTL)) < 0) {
+ if (setsockopt(sockfd, IPPROTO_IPV6, IPV6_MULTICAST_HOPS, &mcastTTLc,
sizeof(mcastTTLc)) < 0) {
ff_log_net_error(NULL, AV_LOG_ERROR,
"setsockopt(IPV6_MULTICAST_HOPS)");
return ff_neterrno();
}
