<pre style='margin:0'>
Herby Gillot (herbygillot) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/53533e4577ad5fc625b8d6ddb784423b3c3de00c">https://github.com/macports/macports-ports/commit/53533e4577ad5fc625b8d6ddb784423b3c3de00c</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 53533e4577ad5fc625b8d6ddb784423b3c3de00c
</span>Author: Sergey Fedorov <barracuda@macos-powerpc.org>
AuthorDate: Sat Aug 3 20:49:15 2024 +0800
<span style='display:block; white-space:pre;color:#404040;'> ffmpeg-devel: update to 7.0.2
</span>---
multimedia/ffmpeg-devel/Portfile | 100 +++++-----
.../files/patch-avutil-builtin-available.diff | 135 ++++++++++++++
.../patch-issue-9439-non-b-frame-encoding.diff | 18 --
.../files/patch-libavcodec-audiotoolboxenc.c.diff | 16 +-
.../files/patch-libavcodec-librsvgdec.diff | 26 +++
.../patch-libavcodec-libsvtav1-ten_bit_format.diff | 40 ----
.../files/patch-libavcodec-profvidworkflow.diff | 46 +++++
.../files/patch-libavcodec-videotoolboxenc.c.diff | 10 -
multimedia/ffmpeg-devel/files/patch-texinfo-7.diff | 207 ---------------------
9 files changed, 271 insertions(+), 327 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/multimedia/ffmpeg-devel/Portfile b/multimedia/ffmpeg-devel/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 443155550f6..b2baf969451 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/multimedia/ffmpeg-devel/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/multimedia/ffmpeg-devel/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -15,11 +15,10 @@ PortGroup xcode_workaround 1.0
</span>
name ffmpeg-devel
set my_name ffmpeg
<span style='display:block; white-space:pre;background:#ffe0e0;'>-conflicts ffmpeg
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+conflicts ffmpeg7
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# Please increase the revision of mpv whenever ffmpeg's version is updated.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-version 4.4.4
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 9
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 7.0.2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 0
</span> epoch 2
license LGPL-2.1+
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -62,14 +61,14 @@ distname ${my_name}-${version}
</span> dist_subdir ${my_name}
use_xz yes
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 ac9916e0915cfe3952993644d0a26d9e7c70e1b7 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 e80b380d595c809060f66f96a5d849511ef4a76a26b76eacf5778b94c3570309 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 9565584
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 de4f62fc14c722a0003c1e4781a22f86830c67c4 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 8646515b638a3ad303e23af6a3587734447cb8fc0a0c064ecdb8e95c4fd8b389 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 10795332
</span>
depends_build-append \
port:cctools \
port:gmake \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:pkgconfig \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ path:bin/pkg-config:pkgconfig \
</span> port:texinfo
depends_lib-append \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -81,6 +80,7 @@ depends_lib-append \
</span> path:lib/pkgconfig/gnutls.pc:gnutls \
path:lib/pkgconfig/harfbuzz.pc:harfbuzz \
port:lame \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:lcms2 \
</span> path:lib/pkgconfig/libass.pc:libass \
port:libbluray \
port:libiconv \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -91,6 +91,7 @@ depends_lib-append \
</span> port:libtheora \
port:libvorbis \
path:lib/pkgconfig/vpx.pc:libvpx \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:lzo2 \
</span> port:openjpeg \
port:soxr \
path:lib/libspeex.dylib:speex \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -100,30 +101,22 @@ depends_lib-append \
</span> port:zvbi
patchfiles-append patch-libavcodec-audiotoolboxenc.c.diff
<span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append patch-avutil-builtin-available.diff
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# Fix an upstream bug that overrides the max_b_frames setting
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# https://trac.ffmpeg.org/ticket/9231
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# Fixed via upstream commit: 55d9d6767967794edcdd6e1bbd8840fc6f4e9315
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles-append patch-libavcodec-videotoolboxenc.c.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# Patch for upstream bug related to non-B-frame encoding
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# https://trac.ffmpeg.org/ticket/9439
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# Fixed via upstream commit: b786bc7433dfe082441a57c1ba9ae9ea47904b78
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles-append patch-issue-9439-non-b-frame-encoding.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# Patch for upstream issue:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# libavcodec/libsvtav1.c:124:53: error: no member named 'compressed_ten_bit_format' in 'struct EbSvtAv1EncConfiguration'
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# (config->encoder_bit_depth > 8) && (config->compressed_ten_bit_format == 0) ? 1 : 0;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# ~~~~~~ ^
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# https://trac.macports.org/ticket/67327
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# Fixed via upstream commit: 031f1561cd286596cdb374da32f8aa816ce3b135
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles-append patch-libavcodec-libsvtav1-ten_bit_format.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# Patch for building docs with texinfo >= 7
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# https://trac.macports.org/ticket/68747
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# https://trac.ffmpeg.org/ticket/10636
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# Fixed via upstream commit: f01fdedb69e4accb1d1555106d8f682ff1f1ddc7
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles-append patch-texinfo-7.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Additional fixes related to use of '__builtin_available'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# TODO: Submit patches to upstream
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append patch-libavcodec-profvidworkflow.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# https://trac.macports.org/ticket/68973
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# TODO: Raise the issue to upstream
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append patch-libavcodec-librsvgdec.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# https://trac.macports.org/ticket/68720
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Remove once upstream has included these in the next release
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# patchfiles-append patch-issue-10695.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# https://trac.macports.org/ticket/69678
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# patchfiles-append patch-fix-vulkan.diff
</span>
# enable auto configure of asm optimizations
# requires Xcode 3.1 or better on Leopard
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -156,12 +149,22 @@ configure.cflags-append \
</span> -Wno-deprecated-declarations \
${configure.cppflags}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-set port_sharedir ${prefix}/share
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set port_ver_major [lindex [split ${version} .] 0]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set port_alias ${my_name}${port_ver_major}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set port_prefix ${prefix}/libexec/${port_alias}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set port_bindir ${port_prefix}/bin
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set port_sharedir ${port_prefix}/share
</span> set port_docdir ${port_sharedir}/doc
<span style='display:block; white-space:pre;background:#e0ffe0;'>+set port_datadir ${port_sharedir}/data
</span>
<span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.pre_args-delete \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --prefix=${prefix}
</span> configure.pre_args-append \
--cc="${configure.cc}" \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- --mandir=${prefix}/share/man
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --datadir=${port_datadir} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --docdir=${port_docdir} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --progs-suffix=${port_ver_major} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --prefix=${port_prefix}
</span>
configure.args-append \
--disable-audiotoolbox \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -169,18 +172,23 @@ configure.args-append \
</span> --disable-libjack \
--disable-libopencore-amrnb \
--disable-libopencore-amrwb \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ --disable-libplacebo \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --disable-libvmaf \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --disable-libwebp \
</span> --disable-libxcb \
--disable-libxcb-shm \
--disable-libxcb-xfixes \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ --disable-metal \
</span> --disable-opencl \
--disable-outdev=xv \
--disable-sdl2 \
--disable-securetransport \
--disable-videotoolbox \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ --disable-xlib \
</span> --enable-avfilter \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- --enable-avresample \
</span> --enable-fontconfig \
--enable-gnutls \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ --enable-lcms2 \
</span> --enable-libass \
--enable-libbluray \
--enable-libdav1d \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -312,19 +320,12 @@ platform darwin {
</span> # this port requires '-ld_classic' to build successfully with the toolchains from Xcode 15 or Command Line Tools 15.
#
# TODO: This is a temporary solution, the classic linker will be removed in a future release by Apple.
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if { ( [vercmp ${xcodeversion} 15 ] >= 0 ) || ( [vercmp ${xcodecltversion} 15 ] >= 0 ) } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if { ${os.major} == 23 && ( [vercmp ${xcodeversion} 15 ] >= 0 ) || ( [vercmp ${xcodecltversion} 15 ] >= 0 ) } {
</span> configure.ldflags-append \
-Wl,-ld_classic
}
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# libavcodec/pcm-bluray.c:172:45: error: passing argument 2 of 'bytestream2_get_buffer' from incompatible pointer type [-Wincompatible-pointer-types]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# libavcodec/pcm-dvd.c:155:37: error: passing argument 2 of 'bytestream2_get_buffer' from incompatible pointer type [-Wincompatible-pointer-types]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-if {[string match *gcc* ${configure.compiler}]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.cflags-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -Wno-error=incompatible-pointer-types
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> platform powerpc {
# absence of altivec is not automatically detected
if {[catch {sysctl hw.vectorunit} result] || $result == 0} {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -344,6 +345,10 @@ platform powerpc {
</span> -latomic
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# libavcodec/pcm-bluray.c: error: passing argument 2 of 'bytestream2_get_buffer' from incompatible pointer type [-Wincompatible-pointer-types]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.cflags-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -Wno-error=incompatible-pointer-types
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> # configure isn't autoconf and they do use a dep cache
configure.universal_args-delete \
--disable-dependency-tracking
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -391,6 +396,15 @@ post-destroot {
</span> foreach f [glob ${worksrcpath}/doc/*.txt] {
file copy $f ${destroot}${port_docdir}
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Create bin symlinks
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set port_bin_list \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ [glob -type f -directory ${destroot}${port_bindir} *]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ foreach f ${port_bin_list} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set fname [file tail ${f}]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ui_info "Symlinking bin: ${prefix}/bin/${fname} -> ${port_bindir}/${fname}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ln -s ${port_bindir}/${fname} ${destroot}${prefix}/bin/${fname}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> }
variant x11 {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -543,4 +557,4 @@ This build of ${name} includes no GPLed or nonfree code and is therefore license
</span>
livecheck.type regex
livecheck.url ${master_sites}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-livecheck.regex "${my_name}-(4(?:\\.\\d+)*)${extract.suffix}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+livecheck.regex "${my_name}-(${port_ver_major}(?:\\.\\d+)*)${extract.suffix}"
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/multimedia/ffmpeg-devel/files/patch-avutil-builtin-available.diff b/multimedia/ffmpeg-devel/files/patch-avutil-builtin-available.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..864972edffd
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/multimedia/ffmpeg-devel/files/patch-avutil-builtin-available.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,135 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# =============================================================================
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Source: https://www.mail-archive.com/ffmpeg-devel@ffmpeg.org/msg127034.html
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# -----------------------------------------------------------------------------
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# From: Limin Wang <lance.lmw...@gmail.com>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# OSX version: 10.11.6
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Apple LLVM version 8.0.0 (clang-800.0.42.1)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Target: x86_64-apple-darwin15.6.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# =============================================================================
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- libavutil/hwcontext_videotoolbox.c.old 2022-01-14 13:45:40.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ libavutil/hwcontext_videotoolbox.c 2022-03-27 12:26:48.000000000 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -415,12 +415,13 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ switch (space) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ case AVCOL_SPC_BT2020_CL:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ case AVCOL_SPC_BT2020_NCL:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #if HAVE_KCVIMAGEBUFFERYCBCRMATRIX_ITU_R_2020
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if (__builtin_available(macOS 10.11, iOS 9, *))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- return kCVImageBufferYCbCrMatrix_ITU_R_2020;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ return kCVImageBufferYCbCrMatrix_ITU_R_2020;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ return CFSTR("ITU_R_2020");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return CFSTR("ITU_R_2020");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ case AVCOL_SPC_BT470BG:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ case AVCOL_SPC_SMPTE170M:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return kCVImageBufferYCbCrMatrix_ITU_R_601_4;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -428,12 +429,13 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return kCVImageBufferYCbCrMatrix_ITU_R_709_2;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ case AVCOL_SPC_SMPTE240M:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return kCVImageBufferYCbCrMatrix_SMPTE_240M_1995;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ default:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #if HAVE_KCVIMAGEBUFFERTRANSFERFUNCTION_ITU_R_2100_HLG
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if (__builtin_available(macOS 10.13, iOS 11, tvOS 11, watchOS 4, *))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- return CVYCbCrMatrixGetStringForIntegerCodePoint(space);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ return kCVImageBufferTransferFunction_ITU_R_2100_HLG;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ return CFSTR("ITU_R_2100_HLG");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ case AVCOL_SPC_UNSPECIFIED:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return NULL;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -441,24 +443,25 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CFStringRef av_map_videotoolbox_color_primaries_from_av(enum AVColorPrimaries pri)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ switch (pri) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ case AVCOL_PRI_BT2020:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #if HAVE_KCVIMAGEBUFFERCOLORPRIMARIES_ITU_R_2020
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if (__builtin_available(macOS 10.11, iOS 9, *))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- return kCVImageBufferColorPrimaries_ITU_R_2020;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ return kCVImageBufferColorPrimaries_ITU_R_2020;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return CFSTR("ITU_R_2020");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ case AVCOL_PRI_BT709:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return kCVImageBufferColorPrimaries_ITU_R_709_2;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ case AVCOL_PRI_SMPTE170M:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return kCVImageBufferColorPrimaries_SMPTE_C;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ case AVCOL_PRI_BT470BG:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return kCVImageBufferColorPrimaries_EBU_3213;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ default:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #if HAVE_KCVIMAGEBUFFERTRANSFERFUNCTION_ITU_R_2100_HLG
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if (__builtin_available(macOS 10.13, iOS 11, tvOS 11, watchOS 4, *))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- return CVColorPrimariesGetStringForIntegerCodePoint(pri);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ return kCVImageBufferTransferFunction_ITU_R_2100_HLG;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ return CFSTR("ITU_R_2100_HLG");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ case AVCOL_PRI_UNSPECIFIED:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return NULL;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -467,45 +470,46 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ switch (trc) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ case AVCOL_TRC_SMPTE2084:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #if HAVE_KCVIMAGEBUFFERTRANSFERFUNCTION_SMPTE_ST_2084_PQ
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if (__builtin_available(macOS 10.13, iOS 11, *))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- return kCVImageBufferTransferFunction_SMPTE_ST_2084_PQ;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ return kCVImageBufferTransferFunction_SMPTE_ST_2084_PQ;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return CFSTR("SMPTE_ST_2084_PQ");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ case AVCOL_TRC_BT2020_10:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ case AVCOL_TRC_BT2020_12:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #if HAVE_KCVIMAGEBUFFERTRANSFERFUNCTION_ITU_R_2020
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if (__builtin_available(macOS 10.11, iOS 9, *))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- return kCVImageBufferTransferFunction_ITU_R_2020;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ return kCVImageBufferTransferFunction_ITU_R_2020;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return CFSTR("ITU_R_2020");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ case AVCOL_TRC_BT709:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return kCVImageBufferTransferFunction_ITU_R_709_2;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ case AVCOL_TRC_SMPTE240M:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return kCVImageBufferTransferFunction_SMPTE_240M_1995;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ case AVCOL_TRC_SMPTE428:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #if HAVE_KCVIMAGEBUFFERTRANSFERFUNCTION_SMPTE_ST_428_1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if (__builtin_available(macOS 10.12, iOS 10, *))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- return kCVImageBufferTransferFunction_SMPTE_ST_428_1;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ return kCVImageBufferTransferFunction_SMPTE_ST_428_1;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return CFSTR("SMPTE_ST_428_1");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ case AVCOL_TRC_ARIB_STD_B67:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #if HAVE_KCVIMAGEBUFFERTRANSFERFUNCTION_ITU_R_2100_HLG
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if (__builtin_available(macOS 10.13, iOS 11, *))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- return kCVImageBufferTransferFunction_ITU_R_2100_HLG;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ return kCVImageBufferTransferFunction_ITU_R_2100_HLG;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return CFSTR("ITU_R_2100_HLG");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ case AVCOL_TRC_GAMMA22:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return kCVImageBufferTransferFunction_UseGamma;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ case AVCOL_TRC_GAMMA28:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return kCVImageBufferTransferFunction_UseGamma;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ default:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #if HAVE_KCVIMAGEBUFFERTRANSFERFUNCTION_ITU_R_2100_HLG
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if (__builtin_available(macOS 10.13, iOS 11, tvOS 11, watchOS 4, *))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- return CVTransferFunctionGetStringForIntegerCodePoint(trc);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ return kCVImageBufferTransferFunction_ITU_R_2100_HLG;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ return CFSTR("ITU_R_2100_HLG");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ case AVCOL_TRC_UNSPECIFIED:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return NULL;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/multimedia/ffmpeg-devel/files/patch-issue-9439-non-b-frame-encoding.diff b/multimedia/ffmpeg-devel/files/patch-issue-9439-non-b-frame-encoding.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 25fa01d79ae..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/multimedia/ffmpeg-devel/files/patch-issue-9439-non-b-frame-encoding.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,18 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- libavcodec/videotoolboxenc.c.orig 2021-12-11 09:44:23.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ libavcodec/videotoolboxenc.c 2021-12-11 09:42:05.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-avcodec/videotoolboxenc: Fix non-B-Frame encoding
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-* Sets vtctx->has_b_frames to 0 if the VideoToolbox compression session will not emit B-frames (and, in consequence, no valid DTSs).
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-* Required for the handling of invalid DTSs in 'vtenc_cm_to_avpacket' (line 2018ff) to work correctly and not abort encoding with "DTS is invalid" when no B-frames are generated.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-* See: https://trac.ffmpeg.org/ticket/9439
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1516,7 +1516,10 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (!status && has_b_frames_cfbool) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- //Some devices don't output B-frames for main profile, even if requested.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- // HEVC has b-pyramid
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- vtctx->has_b_frames = (CFBooleanGetValue(has_b_frames_cfbool) && avctx->codec_id == AV_CODEC_ID_HEVC) ? 2 : 1;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (CFBooleanGetValue(has_b_frames_cfbool))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ vtctx->has_b_frames = avctx->codec_id == AV_CODEC_ID_HEVC ? 2 : 1;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ vtctx->has_b_frames = 0;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CFRelease(has_b_frames_cfbool);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- avctx->has_b_frames = vtctx->has_b_frames;
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/multimedia/ffmpeg-devel/files/patch-libavcodec-audiotoolboxenc.c.diff b/multimedia/ffmpeg-devel/files/patch-libavcodec-audiotoolboxenc.c.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index a592a07edc3..97351245ffe 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/multimedia/ffmpeg-devel/files/patch-libavcodec-audiotoolboxenc.c.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/multimedia/ffmpeg-devel/files/patch-libavcodec-audiotoolboxenc.c.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,13 +1,11 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- libavcodec/audiotoolboxenc.c.orig 2016-05-18 05:07:43.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ libavcodec/audiotoolboxenc.c 2016-05-18 05:09:16.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -66,8 +66,10 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- libavcodec/audiotoolboxenc.c.orig 2023-11-11 01:25:17
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ libavcodec/audiotoolboxenc.c 2023-11-13 09:49:29
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -69,7 +69,7 @@
</span> return kAudioFormatMPEG4AAC_HE_V2;
<span style='display:block; white-space:pre;background:#ffe0e0;'>- case FF_PROFILE_AAC_LD:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ case AV_PROFILE_AAC_LD:
</span> return kAudioFormatMPEG4AAC_LD;
<span style='display:block; white-space:pre;background:#e0ffe0;'>+-#if MAC_OS_X_VERSION_MIN_REQUIRED >= 1060
</span> +#if MAC_OS_X_VERSION_MAX_ALLOWED >= 1070
<span style='display:block; white-space:pre;background:#ffe0e0;'>- case FF_PROFILE_AAC_ELD:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ case AV_PROFILE_AAC_ELD:
</span> return kAudioFormatMPEG4AAC_ELD;
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- case AV_CODEC_ID_ADPCM_IMA_QT:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return kAudioFormatAppleIMA4;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/multimedia/ffmpeg-devel/files/patch-libavcodec-librsvgdec.diff b/multimedia/ffmpeg-devel/files/patch-libavcodec-librsvgdec.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..542a84ba506
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/multimedia/ffmpeg-devel/files/patch-libavcodec-librsvgdec.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,26 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From a7bbfb137bbcf7ae37c72ace4b68b3ff6fb38a70 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From: Sergey Fedorov <vital.had@gmail.com>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Date: Fri, 15 Mar 2024 23:13:19 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH] librsvgdec.c: unbreak compilation
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Commit 86ed68420d3b60439d0b7767c53d0fdc1deb7277 introduced a bug which has broken ffmpeg build. Allow it to compile.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+See: https://trac.macports.org/ticket/68973
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+---
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ libavcodec/librsvgdec.c | 2 ++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 1 file changed, 2 insertions(+)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git libavcodec/librsvgdec.c libavcodec/librsvgdec.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index c328fbc774..756c26d868 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- libavcodec/librsvgdec.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ libavcodec/librsvgdec.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -90,8 +90,10 @@ static int librsvg_decode_frame(AVCodecContext *avctx, AVFrame *frame,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ goto end;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ avctx->pix_fmt = AV_PIX_FMT_RGB32;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if LIBRSVG_MAJOR_VERSION > 2 || LIBRSVG_MAJOR_VERSION == 2 && LIBRSVG_MINOR_VERSION >= 52
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ viewport.width = dimensions.width;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ viewport.height = dimensions.height;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ret = ff_get_buffer(avctx, frame, 0);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (ret < 0)
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/multimedia/ffmpeg-devel/files/patch-libavcodec-libsvtav1-ten_bit_format.diff b/multimedia/ffmpeg-devel/files/patch-libavcodec-libsvtav1-ten_bit_format.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 891ca8aca90..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/multimedia/ffmpeg-devel/files/patch-libavcodec-libsvtav1-ten_bit_format.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,40 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#==================================================================================================
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# From 031f1561cd286596cdb374da32f8aa816ce3b135 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# From: Christopher Degawa <christopher.degawa@intel.com>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# Date: Thu, 20 Oct 2022 22:55:27 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# Subject: [PATCH] avcodec/libsvtav1: remove compressed_ten_bit_format and simplify alloc_buffer
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# compressed_ten_bit_format has been deprecated upstream and has no effect
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# and can be removed. Plus, technically it was never used in the first place
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# since it would require the app (ffmpeg) to set it and do additional
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# processing of the input frames.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# Also simplify alloc_buffer by removing calculations relating to the non-existant processing.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# Signed-off-by: Christopher Degawa <christopher.degawa@intel.com>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#==================================================================================================
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- libavcodec/libsvtav1.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ libavcodec/libsvtav1.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -124,16 +124,12 @@ static int svt_print_error(void *log_ctx, EbErrorType err,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- static int alloc_buffer(EbSvtAv1EncConfiguration *config, SvtContext *svt_enc)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- const int pack_mode_10bit =
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- (config->encoder_bit_depth > 8) && (config->compressed_ten_bit_format == 0) ? 1 : 0;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- const size_t luma_size_8bit =
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- config->source_width * config->source_height * (1 << pack_mode_10bit);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- const size_t luma_size_10bit =
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- (config->encoder_bit_depth > 8 && pack_mode_10bit == 0) ? luma_size_8bit : 0;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ const size_t luma_size = config->source_width * config->source_height *
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ (config->encoder_bit_depth > 8 ? 2 : 1);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- EbSvtIOFormat *in_data;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- svt_enc->raw_size = (luma_size_8bit + luma_size_10bit) * 3 / 2;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ svt_enc->raw_size = luma_size * 3 / 2;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- // allocate buffer for in and out
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- svt_enc->in_buf = av_mallocz(sizeof(*svt_enc->in_buf));
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-GitLab
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/multimedia/ffmpeg-devel/files/patch-libavcodec-profvidworkflow.diff b/multimedia/ffmpeg-devel/files/patch-libavcodec-profvidworkflow.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..0afce56c40f
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/multimedia/ffmpeg-devel/files/patch-libavcodec-profvidworkflow.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,46 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- libavcodec/videotoolbox.c.orig 2022-07-21 13:09:43.000000000 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ libavcodec/videotoolbox.c 2022-07-21 13:24:45.000000000 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -36,6 +36,9 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <Availability.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <AvailabilityMacros.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <TargetConditionals.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if defined(MAC_OS_X_VERSION_10_9) && !TARGET_OS_IPHONE && (MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_9)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <VideoToolbox/VTProfessionalVideoWorkflow.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #ifndef kVTVideoDecoderSpecification_RequireHardwareAcceleratedVideoDecoder
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # define kVTVideoDecoderSpecification_RequireHardwareAcceleratedVideoDecoder CFSTR("RequireHardwareAcceleratedVideoDecoder")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- libavcodec/videotoolboxenc.c.orig 2022-01-14 13:45:40.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ libavcodec/videotoolboxenc.c 2022-07-21 14:14:29.000000000 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -23,6 +23,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <CoreMedia/CoreMedia.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <TargetConditionals.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <Availability.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <AvailabilityMacros.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "avcodec.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "libavutil/opt.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "libavutil/avassert.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -37,6 +38,9 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "h264.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "h264_sei.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <dlfcn.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if defined(MAC_OS_X_VERSION_10_9) && !TARGET_OS_IPHONE && (MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_9)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <VideoToolbox/VTProfessionalVideoWorkflow.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #if !HAVE_KCMVIDEOCODECTYPE_HEVC
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ enum { kCMVideoCodecType_HEVC = 'hvc1' };
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1424,11 +1428,9 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return AVERROR(EINVAL);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#if defined(MAC_OS_X_VERSION_10_9) && !TARGET_OS_IPHONE && (MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_9)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if defined(MAC_OS_X_VERSION_10_10) && !TARGET_OS_IPHONE && (MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_10)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (avctx->codec_id == AV_CODEC_ID_PRORES) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if (__builtin_available(macOS 10.10, *)) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- VTRegisterProfessionalVideoWorkflowVideoEncoders();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ VTRegisterProfessionalVideoWorkflowVideoEncoders();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/multimedia/ffmpeg-devel/files/patch-libavcodec-videotoolboxenc.c.diff b/multimedia/ffmpeg-devel/files/patch-libavcodec-videotoolboxenc.c.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 7b907bdd5e8..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/multimedia/ffmpeg-devel/files/patch-libavcodec-videotoolboxenc.c.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,10 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- libavcodec/videotoolboxenc.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ libavcodec/videotoolboxenc.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1398,7 +1398,6 @@ static int vtenc_configure_encoder(AVCodecContext *avctx)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- vtctx->codec_id = avctx->codec_id;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- avctx->max_b_frames = 16;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (vtctx->codec_id == AV_CODEC_ID_H264) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- vtctx->get_param_set_func = CMVideoFormatDescriptionGetH264ParameterSetAtIndex;
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/multimedia/ffmpeg-devel/files/patch-texinfo-7.diff b/multimedia/ffmpeg-devel/files/patch-texinfo-7.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 8b8652ca2dd..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/multimedia/ffmpeg-devel/files/patch-texinfo-7.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,207 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Backported from the below upstream commit.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From f01fdedb69e4accb1d1555106d8f682ff1f1ddc7 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From: Frank Plowman <post@frankplowman.com>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Date: Wed, 8 Nov 2023 07:55:18 +0000
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Subject: [PATCH 1/1] doc/html: support texinfo 7.0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Resolves trac ticket #10636 (http://trac.ffmpeg.org/ticket/10636).
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Texinfo 7.0, released in November 2022, changed the names of various
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-functions. Compiling docs with Texinfo 7.0 resulted in warnings and
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-improperly formatted documentation. More old names appear to have
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-been removed in Texinfo 7.1, released October 2023, which causes docs
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-compilation to fail.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-This commit addresses the issue by adding logic to switch between the old
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-and new function names depending on the Texinfo version. Texinfo 6.8
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-produces identical documentation before and after the patch.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-CC
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-https://www.mail-archive.com/debian-bugs-dist@lists.debian.org/msg1938238.html
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-https://bugs.gentoo.org/916104
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Signed-off-by: Frank Plowman <post@frankplowman.com>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>----
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- doc/t2h.pm | 106 ++++++++++++++++++++++++++++++++++++++++++-----------
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 1 file changed, 85 insertions(+), 21 deletions(-)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/doc/t2h.pm b/doc/t2h.pm
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index d07d974286..b7485e1f1e 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- doc/t2h.pm 2023-04-12 14:01:50
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ doc/t2h.pm 2023-11-21 13:32:35
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -20,8 +20,45 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # License along with FFmpeg; if not, write to the Free Software
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# Texinfo 7.0 changed the syntax of various functions.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# Provide a shim for older versions.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+sub ff_set_from_init_file($$) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ my $key = shift;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ my $value = shift;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (exists &{'texinfo_set_from_init_file'}) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ texinfo_set_from_init_file($key, $value);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ } else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ set_from_init_file($key, $value);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+sub ff_get_conf($) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ my $key = shift;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (exists &{'texinfo_get_conf'}) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ texinfo_get_conf($key);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ } else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ get_conf($key);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+sub get_formatting_function($$) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ my $obj = shift;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ my $func = shift;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ my $sub = $obj->can('formatting_function');
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if ($sub) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return $obj->formatting_function($func);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ } else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return $obj->{$func};
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# determine texinfo version
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+my $program_version_num = version->declare(ff_get_conf('PACKAGE_VERSION'))->numify;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+my $program_version_6_8 = $program_version_num >= 6.008000;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # no navigation elements
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--set_from_init_file('HEADERS', 0);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ff_set_from_init_file('HEADERS', 0);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sub ffmpeg_heading_command($$$$$)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -55,7 +92,7 @@ sub ffmpeg_heading_command($$$$$)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- $element = $command->{'parent'};
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if ($element) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- $result .= &{$self->{'format_element_header'}}($self, $cmdname,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ $result .= &{get_formatting_function($self, 'format_element_header')}($self, $cmdname,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- $command, $element);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -112,7 +149,11 @@ sub ffmpeg_heading_command($$$$$)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- $cmdname
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- = $Texinfo::Common::level_to_structuring_command{$cmdname}->[$heading_level];
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- $result .= &{$self->{'format_heading_text'}}(
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ # format_heading_text expects an array of headings for texinfo >= 7.0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if ($program_version_num >= 7.000000) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ $heading = [$heading];
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ $result .= &{get_formatting_function($self,'format_heading_text')}(
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- $self, $cmdname, $heading,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- $heading_level +
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- $self->get_conf('CHAPTER_HEADER_LEVEL') - 1, $command);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -127,14 +168,14 @@ foreach my $command (keys(%Texinfo::Common::sectioning
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # print the TOC where @contents is used
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--set_from_init_file('INLINE_CONTENTS', 1);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ff_set_from_init_file('INLINE_CONTENTS', 1);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # make chapters <h2>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--set_from_init_file('CHAPTER_HEADER_LEVEL', 2);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ff_set_from_init_file('CHAPTER_HEADER_LEVEL', 2);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Do not add <hr>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--set_from_init_file('DEFAULT_RULE', '');
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--set_from_init_file('BIG_RULE', '');
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ff_set_from_init_file('DEFAULT_RULE', '');
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ff_set_from_init_file('BIG_RULE', '');
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Customized file beginning
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sub ffmpeg_begin_file($$$)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -151,7 +192,18 @@ sub ffmpeg_begin_file($$$)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- my ($title, $description, $encoding, $date, $css_lines,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- $doctype, $bodytext, $copying_comment, $after_body_open,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- $extra_head, $program_and_version, $program_homepage,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- $program, $generator) = $self->_file_header_informations($command);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ $program, $generator);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if ($program_version_num >= 7.000000) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ ($title, $description, $encoding, $date, $css_lines,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ $doctype, $bodytext, $copying_comment, $after_body_open,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ $extra_head, $program_and_version, $program_homepage,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ $program, $generator) = $self->_file_header_information($command);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ } else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ ($title, $description, $encoding, $date, $css_lines,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ $doctype, $bodytext, $copying_comment, $after_body_open,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ $extra_head, $program_and_version, $program_homepage,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ $program, $generator) = $self->_file_header_informations($command);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- my $links = $self->_get_links ($filename, $element);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -207,7 +259,7 @@ sub ffmpeg_end_file($)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sub ffmpeg_end_file($)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- my $self = shift;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- my $program_string = &{$self->{'format_program_string'}}($self);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ my $program_string = &{get_formatting_function($self,'format_program_string')}($self);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- my $program_text = <<EOT;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- <p style="font-size: small;">
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- $program_string
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -224,7 +276,7 @@ texinfo_register_formatting_function('end_file', \&ffm
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Dummy title command
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Ignore title. Title is handled through ffmpeg_begin_file().
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--set_from_init_file('USE_TITLEPAGE_FOR_TITLE', 1);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ff_set_from_init_file('USE_TITLEPAGE_FOR_TITLE', 1);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sub ffmpeg_title($$$$)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return '';
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -242,8 +294,14 @@ sub ffmpeg_float($$$$$)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- my $args = shift;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- my $content = shift;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- my ($caption, $prepended) = Texinfo::Common::float_name_caption($self,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- $command);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ my ($caption, $prepended);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if ($program_version_num >= 7.000000) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ ($caption, $prepended) = Texinfo::Convert::Converter::float_name_caption($self,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ $command);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ } else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ ($caption, $prepended) = Texinfo::Common::float_name_caption($self,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ $command);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- my $caption_text = '';
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- my $prepended_text;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- my $prepended_save = '';
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -315,8 +373,13 @@ sub ffmpeg_float($$$$$)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- $caption->{'args'}->[0], 'float caption');
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if ($prepended_text.$caption_text ne '') {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- $prepended_text = $self->_attribute_class('div','float-caption'). '>'
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- . $prepended_text;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if ($program_version_num >= 7.000000) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ $prepended_text = $self->html_attribute_class('div',['float-caption']). '>'
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ . $prepended_text;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ } else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ $prepended_text = $self->_attribute_class('div','float-caption'). '>'
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ . $prepended_text;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- $caption_text .= '</div>';
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- my $html_class = '';
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -329,8 +392,13 @@ sub ffmpeg_float($$$$$)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- $prepended_text = '';
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- $caption_text = '';
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- return $self->_attribute_class('div', $html_class). '>' . "\n" .
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- $prepended_text . $caption_text . $content . '</div>';
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if ($program_version_num >= 7.000000) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return $self->html_attribute_class('div', [$html_class]). '>' . "\n" .
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ $prepended_text . $caption_text . $content . '</div>';
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ } else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return $self->_attribute_class('div', $html_class). '>' . "\n" .
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ $prepended_text . $caption_text . $content . '</div>';
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- texinfo_register_command_formatting('float',
</span></pre><pre style='margin:0'>
</pre>