mirror of
https://git.ffmpeg.org/ffmpeg.git
synced 2024-09-19 21:06:42 +00:00
c59b80c8d3
* qatar/master: isom: sort and pretty-print codec_movaudio_tags[] isom: remove pointless comments in codec_movaudio_tags[] isom: remove commented-out tag for vorbis movenc: write 'chan' tag for AC-3 in MOV mov: add support for reading and writing the 'chan' tag audioconvert: add some additional channel and channel layout macros audioconvert: change 7.1 "wide" layout to use side surround channels movenc: simplify handling of pcm vs. adpcm vs. other compressed codecs doc: update documentation to use avconv doc: update demuxers section doc: extend external library coverage doc: split platform specific information doc: port the git-howto to texinfo doc: provide fallback css and customize @float doc: document fate in a texinfo doxy: change hue value to match our green Conflicts: doc/fate.txt doc/ffserver.texi doc/general.texi doc/muxers.texi doc/protocols.texi doc/t2h.init libavformat/isom.c libavformat/mov.c libavutil/avutil.h tests/ref/acodec/pcm_s16be tests/ref/acodec/pcm_s24be tests/ref/acodec/pcm_s32be tests/ref/acodec/pcm_s8 tests/ref/lavf/mov Merged-by: Michael Niedermayer <michaelni@gmx.at>
171 lines
3.7 KiB
Plaintext
171 lines
3.7 KiB
Plaintext
# no horiz rules between sections
|
|
$end_section = \&FFmpeg_end_section;
|
|
sub FFmpeg_end_section($$)
|
|
{
|
|
}
|
|
|
|
$EXTRA_HEAD =
|
|
'<link rel="icon" href="favicon.png" type="image/png" />
|
|
<link rel="stylesheet" type="text/css" href="default.css" />
|
|
';
|
|
|
|
$CSS_LINES = <<EOT;
|
|
<style type="text/css">
|
|
<!--
|
|
a.summary-letter { text-decoration: none }
|
|
a { color: #2D6198; }
|
|
a:visited { color: #884488; }
|
|
h1 a, h2 a, h3 a { text-decoration: inherit; color: inherit; }
|
|
p { margin-left: 1em; margin-right: 1em; }
|
|
table { margin-left: 2em; }
|
|
pre { margin-left: 2em; }
|
|
#footer { text-align: center; }
|
|
#body { margin-left: 1em; margin-right: 1em; }
|
|
body { background-color: #313131; margin: 0; }
|
|
|
|
#container {
|
|
background-color: white;
|
|
color: #202020;
|
|
margin-left: 1em;
|
|
margin-right: 1em;
|
|
}
|
|
|
|
h1 {
|
|
background-color: #7BB37B;
|
|
border: 1px solid #6A996A;
|
|
color: #151515;
|
|
font-size: 1.2em;
|
|
padding-bottom: 0.2em;
|
|
padding-left: 0.4em;
|
|
padding-top: 0.2em;
|
|
}
|
|
|
|
h2 {
|
|
color: #313131;
|
|
font-size: 1.2em;
|
|
}
|
|
|
|
h3 {
|
|
color: #313131;
|
|
font-size: 0.8em;
|
|
margin-bottom: -8px;
|
|
}
|
|
|
|
.note {
|
|
margin: 1em;
|
|
border: 1px solid #bbc9d8;
|
|
background-color: #dde1e1;
|
|
}
|
|
|
|
.important {
|
|
margin: 1em;
|
|
border: 1px solid #d26767;
|
|
background-color: #f8e1e1;
|
|
}
|
|
|
|
-->
|
|
</style>
|
|
EOT
|
|
|
|
my $FFMPEG_NAVBAR = $ENV{"FFMPEG_NAVBAR"} || '';
|
|
|
|
$AFTER_BODY_OPEN =
|
|
'<div id="container">' .
|
|
"\n$FFMPEG_NAVBAR\n" .
|
|
'<div id="body">';
|
|
|
|
$PRE_BODY_CLOSE = '</div></div>';
|
|
|
|
$SMALL_RULE = '';
|
|
$BODYTEXT = '';
|
|
|
|
$print_page_foot = \&FFmpeg_print_page_foot;
|
|
sub FFmpeg_print_page_foot($$)
|
|
{
|
|
my $fh = shift;
|
|
print $fh '<div id="footer">' . "\n";
|
|
T2H_DEFAULT_print_page_foot($fh);
|
|
print $fh "</div>\n";
|
|
}
|
|
|
|
$float = \&FFmpeg_float;
|
|
|
|
sub FFmpeg_float($$$$)
|
|
{
|
|
my $text = shift;
|
|
my $float = shift;
|
|
my $caption = shift;
|
|
my $shortcaption = shift;
|
|
|
|
my $label = '';
|
|
if (exists($float->{'id'}))
|
|
{
|
|
$label = &$anchor($float->{'id'});
|
|
}
|
|
my $class = '';
|
|
my $subject = '';
|
|
|
|
if ($caption =~ /NOTE/)
|
|
{
|
|
$class = "note";
|
|
}
|
|
elsif ($caption =~ /IMPORTANT/)
|
|
{
|
|
$class = "important";
|
|
}
|
|
|
|
return '<div class="float ' . $class . '">' . "$label\n" . $text . '</div>';
|
|
}
|
|
|
|
$print_page_head = \&FFmpeg_print_page_head;
|
|
sub FFmpeg_print_page_head($$)
|
|
{
|
|
my $fh = shift;
|
|
my $longtitle = "$Texi2HTML::THISDOC{'title_no_texi'}";
|
|
$longtitle .= ": $Texi2HTML::NO_TEXI{'This'}" if exists $Texi2HTML::NO_TEXI{'This'};
|
|
my $description = $DOCUMENT_DESCRIPTION;
|
|
$description = $longtitle if (!defined($description));
|
|
$description = "<meta name=\"description\" content=\"$description\">" if
|
|
($description ne '');
|
|
$description = $Texi2HTML::THISDOC{'documentdescription'} if (defined($Texi2HTML::THISDOC{'documentdescription'}));
|
|
my $encoding = '';
|
|
$encoding = "<meta http-equiv=\"Content-Type\" content=\"text/html; charset=$ENCODING\">" if (defined($ENCODING) and ($ENCODING ne ''));
|
|
$longtitle =~ s/Documentation.*//g;
|
|
$longtitle = "FFmpeg documentation : " . $longtitle;
|
|
|
|
print $fh <<EOT;
|
|
$DOCTYPE
|
|
<html>
|
|
$Texi2HTML::THISDOC{'copying'}<!-- Created on $Texi2HTML::THISDOC{today} by $Texi2HTML::THISDOC{program} -->
|
|
<!--
|
|
$Texi2HTML::THISDOC{program_authors}
|
|
-->
|
|
<head>
|
|
<title>$longtitle</title>
|
|
|
|
$description
|
|
<meta name="keywords" content="$longtitle">
|
|
<meta name="resource-type" content="document">
|
|
<meta name="distribution" content="global">
|
|
<meta name="Generator" content="$Texi2HTML::THISDOC{program}">
|
|
$encoding
|
|
$CSS_LINES
|
|
$EXTRA_HEAD
|
|
</head>
|
|
|
|
<body $BODYTEXT>
|
|
$AFTER_BODY_OPEN
|
|
EOT
|
|
}
|
|
|
|
# no navigation elements
|
|
$SECTION_NAVIGATION = 0;
|
|
# the same for texi2html 5.0
|
|
$HEADERS = 0;
|
|
|
|
# TOC and Chapter headings link
|
|
$TOC_LINKS = 1;
|
|
|
|
# print the TOC where @contents is used
|
|
$INLINE_CONTENTS = 1;
|