[FFmpeg-devel] [PATCH] 5 patches from the Debian packaging

[Michael Niedermayer]

On Wed, Mar 26, 2014 at 08:14:25PM -0700, Timothy Gu wrote:
> On Mar 26, 2014 7:59 PM, "Michael Niedermayer" <michaelni at gmx.at> wrote:
> >
> > On Wed, Mar 26, 2014 at 07:21:30PM +0100, Andreas Cadhalpun wrote:
> > > Hi,
> > >
> > > On 08.03.2014 04:44, Timothy Gu wrote:
> > > >This patch has more problem than it seems: *-all.html is completely
> > > >broken, CSS is not included at all, and @subsubsection is not
> > > >supported:
> > > >
> > > >(I fixed *-all generation here)
> > > >$ make doc/ffmpeg-all.html
> > > >HTML doc/ffmpeg-all.html
> > > >doc/decoders.texi:65: raising the section level of @subsubsection
> > > >which is too low
> > > >make: *** [doc/ffmpeg-all.html] Error 1
> > >
> > > Now I understand what you mean!
> > > The problem lies not in different versions of texinfo, but rather in
> > > different versions of FFmpeg. In 2.2 a bug in decoders.texi was
> > > introduced, namely the @subsubsection in line 65 that causes this
> > > error should be a @subsection, as it is directly below a @section.
> > >
> > > Apparently texi2html doesn't detect such bugs and thus produces
> > > strange output (see '14.1.0.1 AC-3 Decoder Options' on [1]).
> > >
> > > Attached is a patch for this.
> > >
> > > With this fixed, what do you think about switching to texinfo?
> > >
> > > Best regards,
> > > Andreas
> > >
> > >
> > > 1: https://ffmpeg.org/ffmpeg-all.html#Audio-Decoders
> >
> > >  decoders.texi |    2 +-
> > >  1 file changed, 1 insertion(+), 1 deletion(-)
> > > 78e15de551514adda0f9763e2a2b1df756c62167  Fix-texinfo-error.patch
> > > From ee5fb225c183c174f0c60bfbfac5fc821c34848b Mon Sep 17 00:00:00 2001
> > > From: Andreas Cadhalpun <Andreas.Cadhalpun at googlemail.com>
> > > Date: Wed, 26 Mar 2014 19:13:35 +0100
> > > Subject: [PATCH] Fix texinfo error due to wrong @subsubsection
> >
> > applied
> 
> Please back port to release branches as far back as possible. Thanks.

ive already ported it back to 2.2 locally yesterday
was just to late/tired to do a fate + push
and seems not to apply to older ones

[...]
-- 
Michael     GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB

Good people do not need laws to tell them to act responsibly, while bad
people will find a way around the laws. -- Plato
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 198 bytes
Desc: Digital signature
URL: <http://ffmpeg.org/pipermail/ffmpeg-devel/attachments/20140327/32251ddb/attachment.asc>