<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/d12763e7fbadcbb85895fe60cb849409ab036dc2">https://github.com/macports/macports-ports/commit/d12763e7fbadcbb85895fe60cb849409ab036dc2</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new d12763e7fba ffmpeg: update to 4.4.5
</span>d12763e7fba is described below
<span style='display:block; white-space:pre;color:#808000;'>commit d12763e7fbadcbb85895fe60cb849409ab036dc2
</span>Author: Christopher Nielsen <mascguy@github.com>
AuthorDate: Thu Oct 31 13:20:52 2024 -0400
<span style='display:block; white-space:pre;color:#404040;'> ffmpeg: update to 4.4.5
</span>---
multimedia/ffmpeg/Portfile | 24 +--
.../patch-libavcodec-libsvtav1-ten_bit_format.diff | 40 ----
multimedia/ffmpeg/files/patch-texinfo-7.diff | 207 ---------------------
3 files changed, 5 insertions(+), 266 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/multimedia/ffmpeg/Portfile b/multimedia/ffmpeg/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 7e71908a836..d3fb1e8acb2 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/multimedia/ffmpeg/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/multimedia/ffmpeg/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -17,8 +17,8 @@ name ffmpeg
</span> set my_name ffmpeg
# Please increase the revision of mpv whenever ffmpeg's version is updated.
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 4.4.4
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 10
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 4.4.5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 0
</span> epoch 1
license LGPL-2.1+
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -61,9 +61,9 @@ 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 51d7e4cd1beec0c44c93f466732d11c2573fd77a \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 f9514e0d3515aee5a271283df71636e1d1ff7274b15853bcd84e144be416ab07 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 9575596
</span>
depends_build-append \
port:cctools \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -112,20 +112,6 @@ patchfiles-append patch-libavcodec-videotoolboxenc.c.diff
</span> # Fixed via upstream commit: b786bc7433dfe082441a57c1ba9ae9ea47904b78
patchfiles-append patch-issue-9439-non-b-frame-encoding.diff
<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:#ffe0e0;'>-
</span> # enable auto configure of asm optimizations
# requires Xcode 3.1 or better on Leopard
minimum_xcodeversions {9 3.1}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/multimedia/ffmpeg/files/patch-libavcodec-libsvtav1-ten_bit_format.diff b/multimedia/ffmpeg/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/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/files/patch-texinfo-7.diff b/multimedia/ffmpeg/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/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>