diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-09-03 12:24:47 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-09-03 12:24:47 +0200 |
| commit | 4d13d440ee75321523be88fff1f38f3a154c53b5 (patch) | |
| tree | c09dc50e69953b1bb09ad7e04dc07112f26a6487 | |
| parent | eacf42dd50885936ae05dd7fd415c4544b9f41cf (diff) | |
| parent | 94f084324e648876508bed546d950762f10b875e (diff) | |
| download | ffmpeg-4d13d440ee75321523be88fff1f38f3a154c53b5.tar.gz | |
Merge commit '94f084324e648876508bed546d950762f10b875e'
* commit '94f084324e648876508bed546d950762f10b875e':
texi2pod: Make it output a single encoding string
Conflicts:
doc/texi2pod.pl
See: 12ce58bebdff6bfae9c56dc785e3003968f93277
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | doc/texi2pod.pl | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/doc/texi2pod.pl b/doc/texi2pod.pl index 94e011e42b..6127dd838a 100644 --- a/doc/texi2pod.pl +++ b/doc/texi2pod.pl @@ -332,12 +332,12 @@ $inf = pop @instack; die "No filename or title\n" unless defined $fn && defined $tl; -$chapters{NAME} = "$fn \- $tl\n"; -$chapters{FOOTNOTES} .= "=back\n" if exists $chapters{FOOTNOTES}; - # always use utf8 print "=encoding utf8\n\n"; +$chapters{NAME} = "$fn \- $tl\n"; +$chapters{FOOTNOTES} .= "=back\n" if exists $chapters{FOOTNOTES}; + unshift @chapters_sequence, "NAME"; for $chapter (@chapters_sequence) { if (exists $chapters{$chapter}) { |