[FFmpeg-devel] [PATCH] doc/protocols: document unit of timeouts for ftp and http

[Stefano Sabatini]

On date Friday 2014-07-04 19:58:20 +0200, Lukasz Marek encoded:
> On 4 July 2014 19:11, Michael Niedermayer <michaelni at gmx.at> wrote:
> 
> > On Fri, Jul 04, 2014 at 06:57:44PM +0200, Lukasz Marek wrote:
> > > Signed-off-by: Lukasz Marek <lukasz.m.luki2 at gmail.com>
> > > ---
> > >  doc/protocols.texi |   12 ++++++------
> > >  1 file changed, 6 insertions(+), 6 deletions(-)
> > >
> > > diff --git a/doc/protocols.texi b/doc/protocols.texi
> > > index cd9126c..a87a395 100644
> > > --- a/doc/protocols.texi
> > > +++ b/doc/protocols.texi
> > > @@ -166,9 +166,9 @@ This protocol accepts the following options.
> > >
> > >  @table @option
> > >  @item timeout
> > > -Set timeout of socket I/O operations used by the underlying low level
> > > -operation. By default it is set to -1, which means that the timeout is
> > > -not specified.
> > > +Set timeout in microseconds of socket I/O operations used by the
> > underlying
> > > +low level operation. By default it is set to -1, which means that the
> > timeout
> > > +is not specified.
> >
> > please avoid re-wraping the lines, it makes review and reading git log
> > harder
> >
> 
> I wasn't sure to rewrap or not texi file. Fixed patch is attached.

> From c57bfb6666ef2468bd12a7125b91c26d5a45c6de Mon Sep 17 00:00:00 2001
> From: Lukasz Marek <lukasz.m.luki2 at gmail.com>
> Date: Fri, 4 Jul 2014 19:48:00 +0200
> Subject: [PATCH] doc/protocols: document unit of timeouts for ftp and http
> 
> Signed-off-by: Lukasz Marek <lukasz.m.luki2 at gmail.com>
> ---
>  doc/protocols.texi |    4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)

Thanks, applied.
-- 
FFmpeg = Forgiving & Fundamental Mythic Proud Elegant Genius