[FFmpeg-devel] [FFmpeg-cvslog] rtsp: rename certain options after a deprecation period

[wm4]

On Fri, 16 Feb 2018 00:52:19 +0100
Alexander Strasser <eclipse7 at gmx.net> wrote:

> Hi!
> 
> On 2018-02-04 14:22 +0000, wm4 wrote:
> > ffmpeg | branch: master | wm4 <nfxjfg at googlemail.com> | Thu Jan 25 18:57:26 2018 +0100| [ff46124b0df17a1d35249e09ae8eae9a61f16e04] | committer: wm4
> > 
> > rtsp: rename certain options after a deprecation period
> > 
> > The "timeout" option name inherently clashes with the meaning of the
> > HTTP libavformat protocol option with the same name. Rename it after a
> > deprecation period to make it compatible with the HTTP one.
> >   
> > > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=ff46124b0df17a1d35249e09ae8eae9a61f16e04  
> > ---
> > 
> >  doc/APIchanges        |  7 +++++++
> >  libavformat/rtsp.c    | 12 ++++++++++--
> >  libavformat/version.h |  3 +++
> >  3 files changed, 20 insertions(+), 2 deletions(-)
> > 
> > diff --git a/doc/APIchanges b/doc/APIchanges
> > index 6185545d56..b802f62d4d 100644
> > --- a/doc/APIchanges
> > +++ b/doc/APIchanges
> > @@ -15,6 +15,13 @@ libavutil:     2017-10-21
> >  
> >  API changes, most recent first:
> >  
> > +2018-02-xx - xxxxxxx - lavf 58.8.100 - avformat.h
> > +  Deprecate the current names of the RTSP "timeout", "stimeout", "user-agent"
> > +  options. Introduce "listen_timeout" as replacement for the current "timeout"
> > +  option, and "user_agent" as replacement for "user-agent". Once the deprecation
> > +  is over, the old "timeout" option will be removed, and "stimeout" will be
> > +  renamed to "stimeout" (the "timeout" option will essentially change semantics).  
>                  ^^^^^^^^
> 
> Looks like a typo up there. Should it be "timeout" instead?
> 

Yep, look like you're correct.