[FFmpeg-devel] [PATCH] doc/ffmpeg: update and extend documentation for -copytb

[Stefano Sabatini]

On date Tuesday 2012-03-27 03:00:27 +0200, Michael Niedermayer encoded:
> On Sun, Mar 25, 2012 at 11:56:12AM +0200, Stefano Sabatini wrote:
[...]
> > Subject: [PATCH] doc/ffmpeg: update and extend documentation for -copytb
> > 
> > Address trac ticket #1120.
> > ---
> >  doc/ffmpeg.texi |   24 ++++++++++++++++++++++--
> >  ffmpeg.c        |    2 +-
> >  2 files changed, 23 insertions(+), 3 deletions(-)
> > 
> > diff --git a/doc/ffmpeg.texi b/doc/ffmpeg.texi
> > index 402a4ae..b32f735 100644
> > --- a/doc/ffmpeg.texi
> > +++ b/doc/ffmpeg.texi
> > @@ -765,8 +765,28 @@ the parameter is the maximum samples per second by which the audio is changed.
> >  without any later correction.
> >  @item -copyts
> >  Copy timestamps from input to output.
> > - at item -copytb
> > -Copy input stream time base from input to output when stream copying.
> > + at item -copytb @var{mode}
> > +Specify how to set the timebase when stream copying. @var{mode} is an
> > +integer numeric value, and it can assume one of the following values:
> > +
> > + at table @option
> > + at item 1
> > +The output time base is copied unchanged from the corresponding input
> > +stream. This is sometimes required to avoid non monotonically
> > +increasing timestamps when copying video streams with variable frame
> > +rate.
> > +
> > + at item 0
> > +The output time base is changed as required in case the output
> > +supports variable frame rate.
> > +
> > + at item -1
> > +The output time base is changed as with @code{-copytb 0}, but only when
> > +it seems required to generate sane output files.
> > + at end table
> > +
> > +Default value is -1.
> 
> The idea behind the values is:
> 
> 1
> use the demuxer timbase
> 
> 0
> use the codec timebase
> 
> -1
> try to make the choice automatically
> 
> your description describes a orthogonal aspect, maybe they can be
> combined ?

Updated.
-- 
FFmpeg = Fast Faithless Merciless Perennial Enlightening Game
-------------- next part --------------
A non-text attachment was scrubbed...
Name: 0001-doc-ffmpeg-update-and-extend-documentation-for-copyt.patch
Type: text/x-diff
Size: 2738 bytes
Desc: not available
URL: <http://ffmpeg.org/pipermail/ffmpeg-devel/attachments/20120327/7792662c/attachment.bin>