* http.c: force nsv when using unsv:// and mime is misc/ultravox.

[vlc] / modules / access / http.c

diff --git a/modules/access/http.c b/modules/access/http.c
index df9dccb91d2a8415808d2613e0ecc702bfc38fee..05be675120a45af501474fc04ec7030dacc886dc 100644 (file)
--- a/modules/access/http.c
+++ b/modules/access/http.c
@@ -385,9 +385,9 @@ static int Open( vlc_object_t *p_this )
     if( !strcmp( p_sys->psz_protocol, "ICY" ) || p_sys->b_icecast )
     {
         if( p_sys->psz_mime && strcasecmp( p_sys->psz_mime, "application/ogg" ) )
-        { 
+        {
             if( !strcasecmp( p_sys->psz_mime, "video/nsv" ) ||
-                   !strcasecmp( p_sys->psz_mime, "video/nsa") )
+                !strcasecmp( p_sys->psz_mime, "video/nsa" ) )
                 p_access->psz_demux = strdup( "nsv" );
             else if( !strcasecmp( p_sys->psz_mime, "audio/aac" ) ||
                      !strcasecmp( p_sys->psz_mime, "audio/aacp" ) )
@@ -411,6 +411,13 @@ static int Open( vlc_object_t *p_this )
         }
         /* else probably Ogg Vorbis */
     }
+    else if( !strcasecmp( p_access->psz_access, "unsv" ) &&
+             p_sys->psz_mime &&
+             !strcasecmp( p_sys->psz_mime, "misc/ultravox" ) )
+    {
+        /* Grrrr! detect ultravox server and force NSV demuxer */
+        p_access->psz_demux = strdup( "nsv" );
+    }
 
     if( p_sys->b_reconnect ) msg_Dbg( p_access, "auto re-connect enabled" );