[FFmpeg-devel] [PATCH] doc/encoders: partially rewrite and reformat libx264 docs

[Timothy Gu]

On Jul 21, 2013 4:00 AM, "Stefano Sabatini" <stefasab at gmail.com> wrote:
>
> On date Saturday 2013-07-20 16:11:04 -0700, Timothy Gu encoded:
> > Format is based on the thread:
> > "[PATCH] doc/encoders: Add libopus encoder doc" (06-28-2013)
> > http://thread.gmane.org/gmane.comp.video.ffmpeg.devel/165368/
> >
> > Also merge the two options section (Mapping and Private options).
> >
> > Patch partially edited by Stefano Sabatini.
> > ---
> >  doc/codecs.texi   |   1 +
> >  doc/encoders.texi | 419
++++++++++++++++++++++++++++++++++++------------------
> >  2 files changed, 280 insertions(+), 140 deletions(-)
> >
> > diff --git a/doc/codecs.texi b/doc/codecs.texi
> > index 4af8dcd..6ff2a65 100644
> > --- a/doc/codecs.texi
> > +++ b/doc/codecs.texi
> > @@ -1,3 +1,4 @@
> > + at anchor{codec-options}
> >  @chapter Codec Options
> >  @c man begin CODEC OPTIONS
> >
> > diff --git a/doc/encoders.texi b/doc/encoders.texi
> > index fb47586..00ed064 100644
> > --- a/doc/encoders.texi
> > +++ b/doc/encoders.texi
> > @@ -873,178 +873,317 @@ For more information about libvpx see:
> >
> >  x264 H.264/MPEG-4 AVC encoder wrapper.
> >
> > -Requires the presence of the libx264 headers and library during
> > -configuration. You need to explicitly configure the build with
> > +This encoder requires the presence of the libx264 headers and library
> > +during configuration. You need to explicitly configure the build with
> >  @code{--enable-libx264}.
> >
> > -x264 supports an impressive number of features, including 8x8 and 4x4
adaptive
> > -spatial transform, adaptive B-frame placement, CAVLC/CABAC entropy
coding,
> > -interlacing (MBAFF), lossless mode, psy optimizations for detail
retention
> > -(adaptive quantization, psy-RD, psy-trellis).
> > +libx264 supports an impressive number of features, including 8x8 and
> > +4x4 adaptive spatial transform, adaptive B-frame placement, CAVLC/CABAC
> > +entropy coding, interlacing (MBAFF), lossless mode, psy optimizations
> > +for detail retention (adaptive quantization, psy-RD, psy-trellis).
> >
> > -The FFmpeg wrapper provides a mapping for most of them using global
options
> > -that match those of the encoders and provides private options for the
unique
> > -encoder options. Additionally an expert override is provided to
directly pass
> > -a list of key=value tuples as accepted by x264_param_parse.
> > +Many libx264 encoder options are mapped to FFmpeg global codec
> > +options, while unique encoder options are provided through private
>
> > +options. Additionally the @option{x264opts} private options allows to
>
> the @option{x264opts} and @option{x264-params} private options allow ...

May I ask why there are two similar options? Because of the fork?

[...]

Timothy