Commit dcaf452a authored by Gildas Bazin's avatar Gildas Bazin

* modules/demux/livedotcom.cpp: fixed segfaults.

parent ba1d10cd
...@@ -425,7 +425,7 @@ static int Open ( vlc_object_t *p_this ) ...@@ -425,7 +425,7 @@ static int Open ( vlc_object_t *p_this )
{ {
es_format_Init( &tk->fmt, AUDIO_ES, VLC_FOURCC('u','n','d','f') ); es_format_Init( &tk->fmt, AUDIO_ES, VLC_FOURCC('u','n','d','f') );
tk->fmt.audio.i_channels = sub->numChannels(); tk->fmt.audio.i_channels = sub->numChannels();
tk->fmt.audio.i_rate = sub->rtpSource()->timestampFrequency(); tk->fmt.audio.i_rate = sub->rtpTimestampFrequency();
if( !strcmp( sub->codecName(), "MPA" ) || if( !strcmp( sub->codecName(), "MPA" ) ||
!strcmp( sub->codecName(), "MPA-ROBUST" ) || !strcmp( sub->codecName(), "MPA-ROBUST" ) ||
...@@ -457,6 +457,14 @@ static int Open ( vlc_object_t *p_this ) ...@@ -457,6 +457,14 @@ static int Open ( vlc_object_t *p_this )
{ {
tk->fmt.i_codec = VLC_FOURCC( 'a', 'l', 'a', 'w' ); tk->fmt.i_codec = VLC_FOURCC( 'a', 'l', 'a', 'w' );
} }
else if( !strcmp( sub->codecName(), "AMR" ) )
{
tk->fmt.i_codec = VLC_FOURCC( 's', 'a', 'm', 'r' );
}
else if( !strcmp( sub->codecName(), "AMR-WB" ) )
{
tk->fmt.i_codec = VLC_FOURCC( 's', 'a', 'w', 'b' );
}
else if( !strcmp( sub->codecName(), "MP4A-LATM" ) ) else if( !strcmp( sub->codecName(), "MP4A-LATM" ) )
{ {
unsigned int i_extra; unsigned int i_extra;
...@@ -778,7 +786,7 @@ static int Demux( demux_t *p_demux ) ...@@ -778,7 +786,7 @@ static int Demux( demux_t *p_demux )
live_track_t *tk = p_sys->track[i]; live_track_t *tk = p_sys->track[i];
if( !tk->b_muxed && !tk->b_rtcp_sync && if( !tk->b_muxed && !tk->b_rtcp_sync &&
tk->rtpSource->hasBeenSynchronizedUsingRTCP() ) tk->rtpSource && tk->rtpSource->hasBeenSynchronizedUsingRTCP() )
{ {
msg_Dbg( p_demux, "tk->rtpSource->hasBeenSynchronizedUsingRTCP()" ); msg_Dbg( p_demux, "tk->rtpSource->hasBeenSynchronizedUsingRTCP()" );
......
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