p_stream->i_fourcc == VLC_FOURCC('d','v','s','d') ||
p_stream->i_fourcc == VLC_FOURCC('d','v','h','d') )
{
+ free( p_access->psz_demux );
p_access->psz_demux = strdup( "rawdv" );
}
else if( p_stream->i_fourcc == VLC_FOURCC('m','p','2','v') )
{
- p_access->psz_demux = "mpgv";
+ free( p_access->psz_demux );
+ p_access->psz_demux = strdup( "mpgv" );
}
}
access_sys_t *p_sys = p_access->p_sys;
block_t *p_block = NULL;
-// if( !p_access->psz_demux )
-// p_access->psz_demux = strdup( "rawdv" );
+#if 0
+ if( !p_access->psz_demux )
+ {
+ free( p_access->psz_demux );
+ p_access->psz_demux = strdup( "rawdv" );
+ }
+#endif
vlc_mutex_lock( &p_sys->lock );
p_block = p_sys->p_frame;
{
if( !strcasecmp( p_sys->psz_mime, "video/nsv" ) ||
!strcasecmp( p_sys->psz_mime, "video/nsa" ) )
+ {
+ free( p_access->psz_demux );
p_access->psz_demux = strdup( "nsv" );
+ }
else if( !strcasecmp( p_sys->psz_mime, "audio/aac" ) ||
!strcasecmp( p_sys->psz_mime, "audio/aacp" ) )
+ {
+ free( p_access->psz_demux );
p_access->psz_demux = strdup( "m4a" );
+ }
else if( !strcasecmp( p_sys->psz_mime, "audio/mpeg" ) )
+ {
+ free( p_access->psz_demux );
p_access->psz_demux = strdup( "mp3" );
+ }
msg_Info( p_access, "Raw-audio server found, %s demuxer selected",
p_access->psz_demux );
}
else if( !p_sys->psz_mime )
{
- /* Shoutcast */
- p_access->psz_demux = strdup( "mp3" );
+ free( p_access->psz_demux );
+ /* Shoutcast */
+ p_access->psz_demux = strdup( "mp3" );
}
/* else probably Ogg Vorbis */
}
p_sys->psz_mime &&
!strcasecmp( p_sys->psz_mime, "misc/ultravox" ) )
{
+ free( p_access->psz_demux );
/* Grrrr! detect ultravox server and force NSV demuxer */
p_access->psz_demux = strdup( "nsv" );
}
else if( !strcmp( p_access->psz_access, "itpc" ) )
{
+ free( p_access->psz_demux );
p_access->psz_demux = strdup( "podcast" );
}
else if( p_sys->psz_mime &&
!strncasecmp( p_sys->psz_mime, "application/xspf+xml", 20 ) &&
( memchr( " ;\t", p_sys->psz_mime[20], 4 ) != NULL ) )
+ {
+ free( p_access->psz_demux );
p_access->psz_demux = strdup( "xspf-open" );
+ }
if( p_sys->b_reconnect ) msg_Dbg( p_access, "auto re-connect enabled" );
{
case 33:
msg_Dbg( p_access, "detected MPEG2 TS over RTP" );
+ free( p_access->psz_demux );
p_access->psz_demux = strdup( "ts" );
break;
case 14:
msg_Dbg( p_access, "detected MPEG Audio over RTP" );
+ free( p_access->psz_demux );
p_access->psz_demux = strdup( "mpga" );
break;
case 32:
msg_Dbg( p_access, "detected MPEG Video over RTP" );
+ free( p_access->psz_demux );
p_access->psz_demux = strdup( "mpgv" );
break;