<pre style='margin:0'>
Christopher Nielsen (mascguy) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/77e5ea0328ce34d368e54b1cb072f6a26021759f">https://github.com/macports/macports-ports/commit/77e5ea0328ce34d368e54b1cb072f6a26021759f</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 77e5ea0328ce34d368e54b1cb072f6a26021759f
</span>Author: Christopher Nielsen <mascguy@github.com>
AuthorDate: Sat Oct 23 14:27:51 2021 -0400
<span style='display:block; white-space:pre;color:#404040;'> ffmpeg-devel: reconcile with ffmpeg
</span><span style='display:block; white-space:pre;color:#404040;'> - Add myself as co-maintainer
</span>---
multimedia/ffmpeg-devel/Portfile | 156 ++++++++++-----------
...h-configure-no-error-on-missing-prototypes.diff | 6 +-
.../files/patch-libavcodec-videotoolboxenc.c.diff | 10 ++
3 files changed, 86 insertions(+), 86 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 a4064708b92..60105e615fc 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;'>@@ -5,7 +5,6 @@ PortGroup xcodeversion 1.0
</span> PortGroup muniversal 1.0
PortGroup compiler_blacklist_versions 1.0
PortGroup active_variants 1.1
<span style='display:block; white-space:pre;background:#ffe0e0;'>-PortGroup github 1.0
</span>
# For 'TARGET_OS_OSX', 'TARGET_CPU_ARM64' macros
PortGroup legacysupport 1.1
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -14,19 +13,16 @@ PortGroup legacysupport 1.1
</span> # https://trac.macports.org/ticket/59308
PortGroup xcode_workaround 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-set git_commit fab00b0ae077207a9aa1fa2cea34beb6ed860452
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-set git_release 4.3.git
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-set git_date 20200806
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-github.setup FFmpeg FFmpeg ${git_commit}
</span> name ffmpeg-devel
<span style='display:block; white-space:pre;background:#e0ffe0;'>+set my_name ffmpeg
</span> conflicts ffmpeg
<span style='display:block; white-space:pre;background:#ffe0e0;'>-epoch 1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-version ${git_release}-${git_date}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 6
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Please increase the revision of mpv whenever ffmpeg's version is updated.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+epoch 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 4.4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 0
</span> license LGPL-2.1+
categories multimedia
<span style='display:block; white-space:pre;background:#ffe0e0;'>-maintainers {devans @dbevans} {jeremyhu @jeremyhu} openmaintainer
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+maintainers {devans @dbevans} {jeremyhu @jeremyhu} {mascguy @mascguy} openmaintainer
</span>
description FFmpeg is a complete solution to play, record, convert and \
stream audio and video.
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -60,15 +56,20 @@ long_description FFmpeg is a complete solution to record, convert and \
</span> generators for all common audio/video formats.
platforms darwin
<span style='display:block; white-space:pre;background:#ffe0e0;'>-homepage https://www.ffmpeg.org/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+homepage https://ffmpeg.org/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+master_sites ${homepage}releases/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+distname ${my_name}-${version}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+dist_subdir ${my_name}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+use_xz yes
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 5c43ae2939ac00d69c91a885bb8ed9a3b7e1ba88 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 ea65f48a0cfebdaa6bf8543db389326b579d898e8fecf6b72de2d783f6a167c8 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 13526974
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 0169ae4eb185de3a851a9926bc0b3289512c4be0 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 06b10a183ce5371f915c6bb15b7b1fffbe046e8275099c96affc29e17645d909 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 9557868
</span>
depends_build port:pkgconfig \
port:gmake \
port:ld64 \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:cctools \
</span> port:texinfo
depends_lib port:lame \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -95,7 +96,12 @@ depends_lib port:lame \
</span>
patchfiles patch-libavcodec-audiotoolboxenc.c.diff
<span style='display:block; white-space:pre;background:#ffe0e0;'>-#
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# fix an upstream bug that overrides the max_b_frames setting
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# https://trac.ffmpeg.org/ticket/9231
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# this bug is fixed upstream in commit 55d9d6767967794edcdd6e1bbd8840fc6f4e9315
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# and should therefore be available in the next release version.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append patch-libavcodec-videotoolboxenc.c.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> # enable auto configure of asm optimizations
# requires Xcode 3.1 or better on Leopard
#
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -104,23 +110,15 @@ minimum_xcodeversions {9 3.1}
</span> # requires a C11 compiler
compiler.c_standard 2011
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# warning: unknown warning option '-Werror=partial-availability'; did you mean '-Werror=availability'? [-Wunknown-warning-option]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# warning: unknown warning option '-Wno-bool-operation'; did you mean '-Wno-bool-conversion'? [-Wunknown-warning-option]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-compiler.blacklist-append {clang < 800}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> if {[lsearch [get_canonical_archs] i386] != -1} {
# clang-3.1 hits https://trac.macports.org/ticket/30137 (<rdar://problem/11542429>)
# clang-139 hits https://trac.macports.org/ticket/38141
compiler.blacklist-append {clang < 422.1.7}
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-platform darwin powerpc {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # https://trac.macports.org/ticket/55124
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # requires newer compiler than gcc4.2 to build
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- compiler.blacklist
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- compiler.whitelist macports-gcc-6
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- universal_variant no
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# warning: unknown warning option '-Werror=partial-availability'; did you mean '-Werror=availability'? [-Wunknown-warning-option]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# warning: unknown warning option '-Wno-bool-operation'; did you mean '-Wno-bool-conversion'? [-Wunknown-warning-option]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+compiler.blacklist-append {clang < 800}
</span>
# The old ffmpeg port was GPL-2+ as base and had a no_gpl variant, so this keeps us consistent
# Also, -gpl2 causes other ports to fail to build due to the missing libpostproc (#35473)
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -147,6 +145,7 @@ configure.args --enable-swscale \
</span> --enable-fontconfig \
--enable-libfreetype \
--enable-libfribidi \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ --enable-zlib \
</span> --disable-libjack \
--disable-libopencore-amrnb \
--disable-libopencore-amrwb \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -161,10 +160,17 @@ configure.args --enable-swscale \
</span> --disable-sdl2 \
--disable-securetransport \
--mandir=${prefix}/share/man \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- --enable-shared --enable-pthreads \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --enable-shared \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --enable-pthreads \
</span> --cc=${configure.cc}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# zimg doesn't currently build on 10.7 and below, so only enable it on supported systems
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if { ${os.platform} eq "darwin" && ${os.major} > 11 } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append --enable-libzimg
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append port:zimg
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> platform darwin {
# disable asm on Tiger
# libblueray doesn't build on Tiger so disable for now (#39442)
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -257,6 +263,14 @@ platform powerpc {
</span> # version possibly built on a G4+ or cross-compiled from an Intel system
archive_sites
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # might be needed for any gcc build...
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #Undefined symbols:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # "___atomic_fetch_sub_8", referenced from:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # _fifo_thread_dispatch_message.part.4 in fifo.o
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.ldflags-append -latomic
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> }
platform darwin 8 {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -381,71 +395,47 @@ variant nonfree description {enable nonfree code, libraries and binaries will no
</span>
if {[variant_isset nonfree]} {
notes "
<span style='display:block; white-space:pre;background:#ffe0e0;'>-*******
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-******* This build of ${name} includes nonfree code as follows:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-*******
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-******* libfdk-aac
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-*******
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-******* The following libraries and binaries may not be redistributed:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-*******
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-******* ffmpeg
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-******* libavcodec
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-******* libavdevice
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-******* libavfilter
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-******* libavformat
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-******* libavutil
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-*******
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-******* To remove this restriction remove the variant +nonfree
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-*******
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+This build of ${name} includes nonfree code as follows:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ libfdk-aac
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+The following libraries and binaries may not be redistributed:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ffmpeg
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ libavcodec
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ libavdevice
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ libavfilter
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ libavformat
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ libavutil
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+To remove this restriction remove the variant +nonfree
</span> "
} elseif {[variant_isset gpl3]} {
notes "
<span style='display:block; white-space:pre;background:#ffe0e0;'>-*******
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-******* This build of ${name} includes GPLed code and
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-******* is therefore licensed under GPL v3 or later.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-*******
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-******* The following modules are GPLed:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-*******
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-******* postproc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-******* libsambaclient
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-******* libx264
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-******* libx265
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-******* libxvid
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-*******
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-******* To include all nonfree, GPLed and LGPL code use variant +nonfree.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-******* To remove nonfree and GPLed code leaving only LGPL code remove the
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-******* +gpl2 and +gpl3 variants.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-*******
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+This build of ${name} includes GPLed code and is therefore licensed under GPL v3 or later.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+The following modules are GPLed:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ postproc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ libsambaclient
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ libx264
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ libx265
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ libxvid
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+To include all nonfree, GPLed and LGPL code use variant +nonfree.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+To remove nonfree and GPLed code leaving only LGPL code remove the +gpl2 and +gpl3 variants.
</span> "
} elseif {[variant_isset gpl2]} {
notes "
<span style='display:block; white-space:pre;background:#ffe0e0;'>-*******
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-******* This build of ${name} includes GPLed code and
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-******* is therefore licensed under GPL v2 or later.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-*******
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-******* The following modules are GPLed:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-*******
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-******* postproc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-******* libx264
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-******* libx265
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-******* libxvid
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-*******
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-******* To include all nonfree, GPLed and LGPL code use variant +nonfree.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-******* To remove nonfree and GPLed code leaving only LGPL code remove the
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-******* +gpl2 variant.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-*******
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+This build of ${name} includes GPLed code and is therefore licensed under GPL v2 or later.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+The following modules are GPLed:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ postproc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ libx264
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ libx265
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ libxvid
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+To include all nonfree, GPLed and LGPL code use variant +nonfree.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+To remove nonfree and GPLed code leaving only LGPL code remove the +gpl2 variant.
</span> "
} else {
notes "
<span style='display:block; white-space:pre;background:#ffe0e0;'>-*******
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-******* This build of ${name} includes no GPLed or nonfree
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-******* code and is therefore licensed under LGPL v2.1 or later.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-*******
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+This build of ${name} includes no GPLed or nonfree code\
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+and is therefore licensed under LGPL v2.1 or later.
</span> "
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-#
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#disable livecheck
</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;'>-livecheck.type none
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+livecheck.type regex
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+livecheck.url ${master_sites}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+livecheck.regex "${my_name}-(\\d+(?:\\.\\d+)*)${extract.suffix}"
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/multimedia/ffmpeg-devel/files/patch-configure-no-error-on-missing-prototypes.diff b/multimedia/ffmpeg-devel/files/patch-configure-no-error-on-missing-prototypes.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 7f2d30e531c..473b2207fe2 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/multimedia/ffmpeg-devel/files/patch-configure-no-error-on-missing-prototypes.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/multimedia/ffmpeg-devel/files/patch-configure-no-error-on-missing-prototypes.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,6 +1,6 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- configure.orig 2018-12-08 08:01:03.000000000 -0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ configure 2018-12-08 16:31:39.000000000 -0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -6904,7 +6904,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- configure.old 2015-09-27 18:43:30.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ configure 2015-09-27 18:44:18.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -6788,7 +6788,6 @@
</span> check_optflags -fno-tree-vectorize
check_cflags -Werror=format-security
check_cflags -Werror=implicit-function-declaration
<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>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..7b907bdd5e8
</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-videotoolboxenc.c.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,10 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- libavcodec/videotoolboxenc.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ libavcodec/videotoolboxenc.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1398,7 +1398,6 @@ static int vtenc_configure_encoder(AVCodecContext *avctx)
</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;'>+ vtctx->codec_id = avctx->codec_id;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- avctx->max_b_frames = 16;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (vtctx->codec_id == AV_CODEC_ID_H264) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ vtctx->get_param_set_func = CMVideoFormatDescriptionGetH264ParameterSetAtIndex;
</span></pre><pre style='margin:0'>
</pre>