[vlc-devel] commit: Use Live555 'double authorization' for RTSP-over-HTTP ( Steven Kramer )

git version control git at videolan.org
Mon Jan 26 17:08:14 CET 2009


vlc | branch: master | Steven Kramer <skramer at inbeeld.eu> | Mon Jan 26 14:28:19 2009 +0100| [cdbdb9ca93bff1d6623b10fb51386a17e9d9f0b1] | committer: Rémi Denis-Courmont 

Use Live555 'double authorization' for RTSP-over-HTTP

Signed-off-by: Rémi Denis-Courmont <rdenis at simphalempin.com>

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=cdbdb9ca93bff1d6623b10fb51386a17e9d9f0b1
---

 modules/demux/live555.cpp |   11 +++++++++++
 1 files changed, 11 insertions(+), 0 deletions(-)

diff --git a/modules/demux/live555.cpp b/modules/demux/live555.cpp
index 843ef3d..faeaddb 100644
--- a/modules/demux/live555.cpp
+++ b/modules/demux/live555.cpp
@@ -552,6 +552,17 @@ describe:
     psz_options = p_sys->rtsp->sendOptionsCmd( psz_url, psz_user, psz_pwd,
                                                &authenticator );
 #endif
+    if( psz_options == NULL && authenticator.realm() != NULL )
+    {
+        // try again, with the realm set this time
+#if LIVEMEDIA_LIBRARY_VERSION_INT >= 1223337600
+        psz_options = p_sys->rtsp->sendOptionsCmd( psz_url, psz_user, psz_pwd,
+                                               &authenticator, timeout );
+#else
+        psz_options = p_sys->rtsp->sendOptionsCmd( psz_url, psz_user, psz_pwd,
+                                               &authenticator );
+#endif
+    }
     if( psz_options )
     {
         p_sys->b_get_param = strstr( psz_options, "GET_PARAMETER" ) ? true : false ;




More information about the vlc-devel mailing list