Skip to content

V
vlc-1.1
Commit edbd1a8d authored by Derk-Jan Hartman's avatar Derk-Jan Hartman
Browse files
Options

* fix ogg streams.

parent 402adb57
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 3 deletions
modules/access/http.c
View file @ edbd1a8d
......@@ -368,7 +368,8 @@ static int Open( vlc_object_t *p_this )
goto error;
}
if( !strcmp( p_sys->psz_protocol, "ICY" ) || p_sys->b_icecast )
if( ( !strcmp( p_sys->psz_protocol, "ICY" ) || p_sys->b_icecast ) &&
( strcasecmp( p_sys->psz_mime, "application/ogg" ) ) )
{
if( p_sys->psz_mime && ( !strcasecmp( p_sys->psz_mime, "video/nsv" ) ||
!strcasecmp( p_sys->psz_mime, "video/nsa") ) )
......@@ -379,8 +380,6 @@ static int Open( vlc_object_t *p_this )
p_access->psz_demux = strdup( "m4a" );
else if( p_sys->psz_mime && !strcasecmp( p_sys->psz_mime, "audio/mpeg" ) )
p_access->psz_demux = strdup( "mp3" );
else /* assume mp3, though this is definetly not certain */
p_access->psz_demux = strdup( "mp3" );
msg_Info( p_access, "Raw-audio server found, %s demuxer selected",
p_access->psz_demux );
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment