[FFmpeg-cvslog] doc/t2h.pm: fix missing CSS with texinfo 6.8 and above

2023-12-21 Thread Matthew White
ffmpeg | branch: release/4.4 | Matthew White  | Sun 
Nov 14 00:42:27 2021 +| [ffef78c7a0c99467b727126e35a105debe60b2ab] | 
committer: Michael Niedermayer

doc/t2h.pm: fix missing CSS with texinfo 6.8 and above

Since texinfo commit 6a5ceab6a48a4f052baad9f3474d741428409fd7, the
formatting functions, in particular begin_file, program_string and
end_file, are prefixed with format_, i.e. format_begin_file, etc.

This patch fixes building the documentation when texinfo 6.8, or
above, is used:

Unknown formatting type begin_file
 at /usr/bin/makeinfo line 415.
Unknown formatting type program_string
 at /usr/bin/makeinfo line 415.
Unknown formatting type end_file
 at /usr/bin/makeinfo line 415.

(cherry picked from commit c980dd7a976635426f129417836251740e19b54b)
Signed-off-by: Michael Niedermayer 

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=ffef78c7a0c99467b727126e35a105debe60b2ab
---

 doc/t2h.pm | 22 +++---
 1 file changed, 19 insertions(+), 3 deletions(-)

diff --git a/doc/t2h.pm b/doc/t2h.pm
index e83d564a65..87412699aa 100644
--- a/doc/t2h.pm
+++ b/doc/t2h.pm
@@ -126,6 +126,10 @@ foreach my $command 
(keys(%Texinfo::Common::sectioning_commands), 'node') {
 texinfo_register_command_formatting($command, \&ffmpeg_heading_command);
 }
 
+# determine if texinfo is at least version 6.8
+my $program_version_num = 
version->declare(get_conf('PACKAGE_VERSION'))->numify;
+my $program_version_6_8 = $program_version_num >= 6.008000;
+
 # print the TOC where @contents is used
 set_from_init_file('INLINE_CONTENTS', 1);
 
@@ -184,7 +188,11 @@ EOT
 
 return $head1 . $head_title . $head2 . $head_title . $head3;
 }
-texinfo_register_formatting_function('begin_file', \&ffmpeg_begin_file);
+if ($program_version_6_8) {
+texinfo_register_formatting_function('format_begin_file', 
\&ffmpeg_begin_file);
+} else {
+texinfo_register_formatting_function('begin_file', \&ffmpeg_begin_file);
+}
 
 sub ffmpeg_program_string($)
 {
@@ -201,7 +209,11 @@ sub ffmpeg_program_string($)
   $self->gdt('This document was generated automatically.'));
   }
 }
-texinfo_register_formatting_function('program_string', 
\&ffmpeg_program_string);
+if ($program_version_6_8) {
+texinfo_register_formatting_function('format_program_string', 
\&ffmpeg_program_string);
+} else {
+texinfo_register_formatting_function('program_string', 
\&ffmpeg_program_string);
+}
 
 # Customized file ending
 sub ffmpeg_end_file($)
@@ -220,7 +232,11 @@ EOT
 EOT
 return $program_text . $footer;
 }
-texinfo_register_formatting_function('end_file', \&ffmpeg_end_file);
+if ($program_version_6_8) {
+texinfo_register_formatting_function('format_end_file', \&ffmpeg_end_file);
+} else {
+texinfo_register_formatting_function('end_file', \&ffmpeg_end_file);
+}
 
 # Dummy title command
 # Ignore title. Title is handled through ffmpeg_begin_file().

___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog

To unsubscribe, visit link above, or email
ffmpeg-cvslog-requ...@ffmpeg.org with subject "unsubscribe".


[FFmpeg-cvslog] doc/t2h.pm: fix missing TOC with texinfo 6.8 and above

2023-12-21 Thread Matthew White
ffmpeg | branch: release/4.4 | Matthew White  | Sun 
Nov 14 01:10:58 2021 +| [a6393e3e72f347b3f4562aa175dca4cf5c124edf] | 
committer: Michael Niedermayer

doc/t2h.pm: fix missing TOC with texinfo 6.8 and above

Since texinfo 6.8, there's no longer an INLINE_CONTENTS variable.

makeinfo: warning: set_from_init_file: unknown variable INLINE_CONTENTS

texinfo commit 62a6adfb33b006e187483779974bbd45f0f782b1 replaced
INLINE_CONTENTS with OUTPUT_CONTENTS_LOCATION.

texinfo commit 41f8ed4eb42bf6daa7df7007afd946875597452d replaced
OUTPUT_CONTENTS_LOCATION with CONTENTS_OUTPUT_LOCATION.

With texinfo 6.8 and above, the same as INLINE_CONTENTS=1 could be
achieved by CONTENTS_OUTPUT_LOCATION=inline.
https://www.gnu.org/software/texinfo/manual/texinfo/html_node/HTML-Customization-Variables.html

(cherry picked from commit bfbd5954e50e407693932b3900ca77c3daee26d7)
Signed-off-by: Michael Niedermayer 

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=a6393e3e72f347b3f4562aa175dca4cf5c124edf
---

 doc/t2h.pm | 6 +-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/doc/t2h.pm b/doc/t2h.pm
index 87412699aa..d07d974286 100644
--- a/doc/t2h.pm
+++ b/doc/t2h.pm
@@ -131,7 +131,11 @@ my $program_version_num = 
version->declare(get_conf('PACKAGE_VERSION'))->numify;
 my $program_version_6_8 = $program_version_num >= 6.008000;
 
 # print the TOC where @contents is used
-set_from_init_file('INLINE_CONTENTS', 1);
+if ($program_version_6_8) {
+set_from_init_file('CONTENTS_OUTPUT_LOCATION', 'inline');
+} else {
+set_from_init_file('INLINE_CONTENTS', 1);
+}
 
 # make chapters 
 set_from_init_file('CHAPTER_HEADER_LEVEL', 2);

___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog

To unsubscribe, visit link above, or email
ffmpeg-cvslog-requ...@ffmpeg.org with subject "unsubscribe".


[FFmpeg-cvslog] doc/t2h.pm: fix missing CSS with texinfo 6.8 and above

2024-04-14 Thread Matthew White
ffmpeg | branch: release/4.2 | Matthew White  | Sun 
Nov 14 00:42:27 2021 +| [01b17ca8aa6c4580f175b18a7d945add08d13ffa] | 
committer: Michael Niedermayer

doc/t2h.pm: fix missing CSS with texinfo 6.8 and above

Since texinfo commit 6a5ceab6a48a4f052baad9f3474d741428409fd7, the
formatting functions, in particular begin_file, program_string and
end_file, are prefixed with format_, i.e. format_begin_file, etc.

This patch fixes building the documentation when texinfo 6.8, or
above, is used:

Unknown formatting type begin_file
 at /usr/bin/makeinfo line 415.
Unknown formatting type program_string
 at /usr/bin/makeinfo line 415.
Unknown formatting type end_file
 at /usr/bin/makeinfo line 415.

(cherry picked from commit c980dd7a976635426f129417836251740e19b54b)
Signed-off-by: Michael Niedermayer 

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=01b17ca8aa6c4580f175b18a7d945add08d13ffa
---

 doc/t2h.pm | 22 +++---
 1 file changed, 19 insertions(+), 3 deletions(-)

diff --git a/doc/t2h.pm b/doc/t2h.pm
index e83d564a65..87412699aa 100644
--- a/doc/t2h.pm
+++ b/doc/t2h.pm
@@ -126,6 +126,10 @@ foreach my $command 
(keys(%Texinfo::Common::sectioning_commands), 'node') {
 texinfo_register_command_formatting($command, \&ffmpeg_heading_command);
 }
 
+# determine if texinfo is at least version 6.8
+my $program_version_num = 
version->declare(get_conf('PACKAGE_VERSION'))->numify;
+my $program_version_6_8 = $program_version_num >= 6.008000;
+
 # print the TOC where @contents is used
 set_from_init_file('INLINE_CONTENTS', 1);
 
@@ -184,7 +188,11 @@ EOT
 
 return $head1 . $head_title . $head2 . $head_title . $head3;
 }
-texinfo_register_formatting_function('begin_file', \&ffmpeg_begin_file);
+if ($program_version_6_8) {
+texinfo_register_formatting_function('format_begin_file', 
\&ffmpeg_begin_file);
+} else {
+texinfo_register_formatting_function('begin_file', \&ffmpeg_begin_file);
+}
 
 sub ffmpeg_program_string($)
 {
@@ -201,7 +209,11 @@ sub ffmpeg_program_string($)
   $self->gdt('This document was generated automatically.'));
   }
 }
-texinfo_register_formatting_function('program_string', 
\&ffmpeg_program_string);
+if ($program_version_6_8) {
+texinfo_register_formatting_function('format_program_string', 
\&ffmpeg_program_string);
+} else {
+texinfo_register_formatting_function('program_string', 
\&ffmpeg_program_string);
+}
 
 # Customized file ending
 sub ffmpeg_end_file($)
@@ -220,7 +232,11 @@ EOT
 EOT
 return $program_text . $footer;
 }
-texinfo_register_formatting_function('end_file', \&ffmpeg_end_file);
+if ($program_version_6_8) {
+texinfo_register_formatting_function('format_end_file', \&ffmpeg_end_file);
+} else {
+texinfo_register_formatting_function('end_file', \&ffmpeg_end_file);
+}
 
 # Dummy title command
 # Ignore title. Title is handled through ffmpeg_begin_file().

___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog

To unsubscribe, visit link above, or email
ffmpeg-cvslog-requ...@ffmpeg.org with subject "unsubscribe".


[FFmpeg-cvslog] doc/t2h.pm: fix missing TOC with texinfo 6.8 and above

2024-04-14 Thread Matthew White
ffmpeg | branch: release/4.2 | Matthew White  | Sun 
Nov 14 01:10:58 2021 +| [75d89d4cb65c63109ce56ae4f044daeed4c3abb6] | 
committer: Michael Niedermayer

doc/t2h.pm: fix missing TOC with texinfo 6.8 and above

Since texinfo 6.8, there's no longer an INLINE_CONTENTS variable.

makeinfo: warning: set_from_init_file: unknown variable INLINE_CONTENTS

texinfo commit 62a6adfb33b006e187483779974bbd45f0f782b1 replaced
INLINE_CONTENTS with OUTPUT_CONTENTS_LOCATION.

texinfo commit 41f8ed4eb42bf6daa7df7007afd946875597452d replaced
OUTPUT_CONTENTS_LOCATION with CONTENTS_OUTPUT_LOCATION.

With texinfo 6.8 and above, the same as INLINE_CONTENTS=1 could be
achieved by CONTENTS_OUTPUT_LOCATION=inline.
https://www.gnu.org/software/texinfo/manual/texinfo/html_node/HTML-Customization-Variables.html

(cherry picked from commit bfbd5954e50e407693932b3900ca77c3daee26d7)
Signed-off-by: Michael Niedermayer 

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=75d89d4cb65c63109ce56ae4f044daeed4c3abb6
---

 doc/t2h.pm | 6 +-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/doc/t2h.pm b/doc/t2h.pm
index 87412699aa..d07d974286 100644
--- a/doc/t2h.pm
+++ b/doc/t2h.pm
@@ -131,7 +131,11 @@ my $program_version_num = 
version->declare(get_conf('PACKAGE_VERSION'))->numify;
 my $program_version_6_8 = $program_version_num >= 6.008000;
 
 # print the TOC where @contents is used
-set_from_init_file('INLINE_CONTENTS', 1);
+if ($program_version_6_8) {
+set_from_init_file('CONTENTS_OUTPUT_LOCATION', 'inline');
+} else {
+set_from_init_file('INLINE_CONTENTS', 1);
+}
 
 # make chapters 
 set_from_init_file('CHAPTER_HEADER_LEVEL', 2);

___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog

To unsubscribe, visit link above, or email
ffmpeg-cvslog-requ...@ffmpeg.org with subject "unsubscribe".


[FFmpeg-cvslog] doc/t2h.pm: fix missing CSS with texinfo 6.8 and above

2024-04-14 Thread Matthew White
ffmpeg | branch: release/3.4 | Matthew White  | Sun 
Nov 14 00:42:27 2021 +| [9cc9301da793832f31516b52f6d0047e69a70e53] | 
committer: Michael Niedermayer

doc/t2h.pm: fix missing CSS with texinfo 6.8 and above

Since texinfo commit 6a5ceab6a48a4f052baad9f3474d741428409fd7, the
formatting functions, in particular begin_file, program_string and
end_file, are prefixed with format_, i.e. format_begin_file, etc.

This patch fixes building the documentation when texinfo 6.8, or
above, is used:

Unknown formatting type begin_file
 at /usr/bin/makeinfo line 415.
Unknown formatting type program_string
 at /usr/bin/makeinfo line 415.
Unknown formatting type end_file
 at /usr/bin/makeinfo line 415.

(cherry picked from commit c980dd7a976635426f129417836251740e19b54b)
Signed-off-by: Michael Niedermayer 

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=9cc9301da793832f31516b52f6d0047e69a70e53
---

 doc/t2h.pm | 22 +++---
 1 file changed, 19 insertions(+), 3 deletions(-)

diff --git a/doc/t2h.pm b/doc/t2h.pm
index e83d564a65..87412699aa 100644
--- a/doc/t2h.pm
+++ b/doc/t2h.pm
@@ -126,6 +126,10 @@ foreach my $command 
(keys(%Texinfo::Common::sectioning_commands), 'node') {
 texinfo_register_command_formatting($command, \&ffmpeg_heading_command);
 }
 
+# determine if texinfo is at least version 6.8
+my $program_version_num = 
version->declare(get_conf('PACKAGE_VERSION'))->numify;
+my $program_version_6_8 = $program_version_num >= 6.008000;
+
 # print the TOC where @contents is used
 set_from_init_file('INLINE_CONTENTS', 1);
 
@@ -184,7 +188,11 @@ EOT
 
 return $head1 . $head_title . $head2 . $head_title . $head3;
 }
-texinfo_register_formatting_function('begin_file', \&ffmpeg_begin_file);
+if ($program_version_6_8) {
+texinfo_register_formatting_function('format_begin_file', 
\&ffmpeg_begin_file);
+} else {
+texinfo_register_formatting_function('begin_file', \&ffmpeg_begin_file);
+}
 
 sub ffmpeg_program_string($)
 {
@@ -201,7 +209,11 @@ sub ffmpeg_program_string($)
   $self->gdt('This document was generated automatically.'));
   }
 }
-texinfo_register_formatting_function('program_string', 
\&ffmpeg_program_string);
+if ($program_version_6_8) {
+texinfo_register_formatting_function('format_program_string', 
\&ffmpeg_program_string);
+} else {
+texinfo_register_formatting_function('program_string', 
\&ffmpeg_program_string);
+}
 
 # Customized file ending
 sub ffmpeg_end_file($)
@@ -220,7 +232,11 @@ EOT
 EOT
 return $program_text . $footer;
 }
-texinfo_register_formatting_function('end_file', \&ffmpeg_end_file);
+if ($program_version_6_8) {
+texinfo_register_formatting_function('format_end_file', \&ffmpeg_end_file);
+} else {
+texinfo_register_formatting_function('end_file', \&ffmpeg_end_file);
+}
 
 # Dummy title command
 # Ignore title. Title is handled through ffmpeg_begin_file().

___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog

To unsubscribe, visit link above, or email
ffmpeg-cvslog-requ...@ffmpeg.org with subject "unsubscribe".


[FFmpeg-cvslog] doc/t2h.pm: fix missing TOC with texinfo 6.8 and above

2024-04-14 Thread Matthew White
ffmpeg | branch: release/3.4 | Matthew White  | Sun 
Nov 14 01:10:58 2021 +| [fef23b8c2334ea07ced2ad654fd861e35816cbb3] | 
committer: Michael Niedermayer

doc/t2h.pm: fix missing TOC with texinfo 6.8 and above

Since texinfo 6.8, there's no longer an INLINE_CONTENTS variable.

makeinfo: warning: set_from_init_file: unknown variable INLINE_CONTENTS

texinfo commit 62a6adfb33b006e187483779974bbd45f0f782b1 replaced
INLINE_CONTENTS with OUTPUT_CONTENTS_LOCATION.

texinfo commit 41f8ed4eb42bf6daa7df7007afd946875597452d replaced
OUTPUT_CONTENTS_LOCATION with CONTENTS_OUTPUT_LOCATION.

With texinfo 6.8 and above, the same as INLINE_CONTENTS=1 could be
achieved by CONTENTS_OUTPUT_LOCATION=inline.
https://www.gnu.org/software/texinfo/manual/texinfo/html_node/HTML-Customization-Variables.html

(cherry picked from commit bfbd5954e50e407693932b3900ca77c3daee26d7)
Signed-off-by: Michael Niedermayer 

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=fef23b8c2334ea07ced2ad654fd861e35816cbb3
---

 doc/t2h.pm | 6 +-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/doc/t2h.pm b/doc/t2h.pm
index 87412699aa..d07d974286 100644
--- a/doc/t2h.pm
+++ b/doc/t2h.pm
@@ -131,7 +131,11 @@ my $program_version_num = 
version->declare(get_conf('PACKAGE_VERSION'))->numify;
 my $program_version_6_8 = $program_version_num >= 6.008000;
 
 # print the TOC where @contents is used
-set_from_init_file('INLINE_CONTENTS', 1);
+if ($program_version_6_8) {
+set_from_init_file('CONTENTS_OUTPUT_LOCATION', 'inline');
+} else {
+set_from_init_file('INLINE_CONTENTS', 1);
+}
 
 # make chapters 
 set_from_init_file('CHAPTER_HEADER_LEVEL', 2);

___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog

To unsubscribe, visit link above, or email
ffmpeg-cvslog-requ...@ffmpeg.org with subject "unsubscribe".


[FFmpeg-cvslog] doc/t2h.pm: fix missing CSS with texinfo 6.8 and above

2021-11-13 Thread Matthew White
ffmpeg | branch: master | Matthew White  | Sun Nov 14 
00:42:27 2021 +| [c980dd7a976635426f129417836251740e19b54b] | committer: 
Gyan Doshi

doc/t2h.pm: fix missing CSS with texinfo 6.8 and above

Since texinfo commit 6a5ceab6a48a4f052baad9f3474d741428409fd7, the
formatting functions, in particular begin_file, program_string and
end_file, are prefixed with format_, i.e. format_begin_file, etc.

This patch fixes building the documentation when texinfo 6.8, or
above, is used:

Unknown formatting type begin_file
 at /usr/bin/makeinfo line 415.
Unknown formatting type program_string
 at /usr/bin/makeinfo line 415.
Unknown formatting type end_file
 at /usr/bin/makeinfo line 415.

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=c980dd7a976635426f129417836251740e19b54b
---

 doc/t2h.pm | 22 +++---
 1 file changed, 19 insertions(+), 3 deletions(-)

diff --git a/doc/t2h.pm b/doc/t2h.pm
index e83d564a65..87412699aa 100644
--- a/doc/t2h.pm
+++ b/doc/t2h.pm
@@ -126,6 +126,10 @@ foreach my $command 
(keys(%Texinfo::Common::sectioning_commands), 'node') {
 texinfo_register_command_formatting($command, \&ffmpeg_heading_command);
 }
 
+# determine if texinfo is at least version 6.8
+my $program_version_num = 
version->declare(get_conf('PACKAGE_VERSION'))->numify;
+my $program_version_6_8 = $program_version_num >= 6.008000;
+
 # print the TOC where @contents is used
 set_from_init_file('INLINE_CONTENTS', 1);
 
@@ -184,7 +188,11 @@ EOT
 
 return $head1 . $head_title . $head2 . $head_title . $head3;
 }
-texinfo_register_formatting_function('begin_file', \&ffmpeg_begin_file);
+if ($program_version_6_8) {
+texinfo_register_formatting_function('format_begin_file', 
\&ffmpeg_begin_file);
+} else {
+texinfo_register_formatting_function('begin_file', \&ffmpeg_begin_file);
+}
 
 sub ffmpeg_program_string($)
 {
@@ -201,7 +209,11 @@ sub ffmpeg_program_string($)
   $self->gdt('This document was generated automatically.'));
   }
 }
-texinfo_register_formatting_function('program_string', 
\&ffmpeg_program_string);
+if ($program_version_6_8) {
+texinfo_register_formatting_function('format_program_string', 
\&ffmpeg_program_string);
+} else {
+texinfo_register_formatting_function('program_string', 
\&ffmpeg_program_string);
+}
 
 # Customized file ending
 sub ffmpeg_end_file($)
@@ -220,7 +232,11 @@ EOT
 EOT
 return $program_text . $footer;
 }
-texinfo_register_formatting_function('end_file', \&ffmpeg_end_file);
+if ($program_version_6_8) {
+texinfo_register_formatting_function('format_end_file', \&ffmpeg_end_file);
+} else {
+texinfo_register_formatting_function('end_file', \&ffmpeg_end_file);
+}
 
 # Dummy title command
 # Ignore title. Title is handled through ffmpeg_begin_file().

___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog

To unsubscribe, visit link above, or email
ffmpeg-cvslog-requ...@ffmpeg.org with subject "unsubscribe".


[FFmpeg-cvslog] doc/t2h.pm: fix missing TOC with texinfo 6.8 and above

2021-11-13 Thread Matthew White
ffmpeg | branch: master | Matthew White  | Sun Nov 14 
01:10:58 2021 +| [bfbd5954e50e407693932b3900ca77c3daee26d7] | committer: 
Gyan Doshi

doc/t2h.pm: fix missing TOC with texinfo 6.8 and above

Since texinfo 6.8, there's no longer an INLINE_CONTENTS variable.

makeinfo: warning: set_from_init_file: unknown variable INLINE_CONTENTS

texinfo commit 62a6adfb33b006e187483779974bbd45f0f782b1 replaced
INLINE_CONTENTS with OUTPUT_CONTENTS_LOCATION.

texinfo commit 41f8ed4eb42bf6daa7df7007afd946875597452d replaced
OUTPUT_CONTENTS_LOCATION with CONTENTS_OUTPUT_LOCATION.

With texinfo 6.8 and above, the same as INLINE_CONTENTS=1 could be
achieved by CONTENTS_OUTPUT_LOCATION=inline.
https://www.gnu.org/software/texinfo/manual/texinfo/html_node/HTML-Customization-Variables.html

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=bfbd5954e50e407693932b3900ca77c3daee26d7
---

 doc/t2h.pm | 6 +-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/doc/t2h.pm b/doc/t2h.pm
index 87412699aa..d07d974286 100644
--- a/doc/t2h.pm
+++ b/doc/t2h.pm
@@ -131,7 +131,11 @@ my $program_version_num = 
version->declare(get_conf('PACKAGE_VERSION'))->numify;
 my $program_version_6_8 = $program_version_num >= 6.008000;
 
 # print the TOC where @contents is used
-set_from_init_file('INLINE_CONTENTS', 1);
+if ($program_version_6_8) {
+set_from_init_file('CONTENTS_OUTPUT_LOCATION', 'inline');
+} else {
+set_from_init_file('INLINE_CONTENTS', 1);
+}
 
 # make chapters 
 set_from_init_file('CHAPTER_HEADER_LEVEL', 2);

___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog

To unsubscribe, visit link above, or email
ffmpeg-cvslog-requ...@ffmpeg.org with subject "unsubscribe".