vlc/vlc-2.0 | branch: master | Sébastien Escudier <[email protected]> | Mon Jan 30 15:15:28 2012 +0100| [4615f68fcdc6f0cb0051cc885217f83445abbad1] | committer: Jean-Baptiste Kempf
live555 : fix http retry (cherry picked from commit 4bc2de8cfde1d55d6e605fb79cffc14e36ec1bb3) Signed-off-by: Jean-Baptiste Kempf <[email protected]> > http://git.videolan.org/gitweb.cgi/vlc/vlc-2.0.git/?a=commit;h=4615f68fcdc6f0cb0051cc885217f83445abbad1 --- modules/demux/live555.cpp | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/demux/live555.cpp b/modules/demux/live555.cpp index 6c01789..ed67d8b 100644 --- a/modules/demux/live555.cpp +++ b/modules/demux/live555.cpp @@ -591,7 +591,7 @@ createnew: goto bailout; } - if( var_InheritBool( p_demux, "rtsp-http" ) ) + if( var_CreateGetBool( p_demux, "rtsp-http" ) ) i_http_port = var_InheritInteger( p_demux, "rtsp-http-port" ); p_sys->rtsp = new RTSPClientVlc( *p_sys->env, psz_url, @@ -686,7 +686,7 @@ static int SessionsSetup( demux_t *p_demux ) unsigned const thresh = 200000; /* RTP reorder threshold .2 second (default .1) */ b_rtsp_tcp = var_CreateGetBool( p_demux, "rtsp-tcp" ) || - var_InheritBool( p_demux, "rtsp-http" ); + var_GetBool( p_demux, "rtsp-http" ); i_client_port = var_InheritInteger( p_demux, "rtp-client-port" ); /* Create the session from the SDP */ _______________________________________________ vlc-commits mailing list [email protected] http://mailman.videolan.org/listinfo/vlc-commits
