On Thu, 19 Jun 2014 10:06:48 -0800, Lou Logan wrote:
> On Wed, 18 Jun 2014 14:16:52 +0200, Carl Eugen Hoyos wrote:
>
> > diff --git a/doc/ffmpeg.texi b/doc/ffmpeg.texi
> > index 68fd12f..6f3c2c3 100644
> > --- a/doc/ffmpeg.texi
> > +++ b/doc/ffmpeg.texi
> > @@ -473,6 +473,9 @@ Set frame rate (Hz value, fraction or abbreviation).
> >
> > As an input option, ignore any timestamps stored in the file and instead
> > generate timestamps assuming constant frame rate @var{fps}.
> > +This is not the same as the @option{-framerate} option used for some input
> > formats
> > +like image2 or v4l2 (it used to be the same in older versions of FFmpeg).
> > +If in doubt use @option{-framerate} instead of the input option
> > @option{-r}.
>
> Should x11grab be added to the input format list? According to:
>
> https://trac.ffmpeg.org/ticket/3045#comment:7
>
> -r and -framerate differ there too.
I have no other comments about this patch. It's fine with me if you
push it.
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
