vlc | branch: master | Rémi Denis-Courmont <[email protected]> | Sat Feb 25 14:00:04 2017 +0200| [e9e23b18f70980a514a8e01a10b257ce6692274a] | committer: Rémi Denis-Courmont
xa: do not set callbacks on error > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=e9e23b18f70980a514a8e01a10b257ce6692274a --- modules/demux/xa.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/modules/demux/xa.c b/modules/demux/xa.c index 7f9d260..bdbd107 100644 --- a/modules/demux/xa.c +++ b/modules/demux/xa.c @@ -107,11 +107,6 @@ static int Open( vlc_object_t * p_this ) if( unlikely( p_sys == NULL ) ) return VLC_ENOMEM; - p_demux->pf_demux = Demux; - p_demux->pf_control = Control; - p_demux->p_sys = p_sys; - p_sys->p_es = NULL; - /* skip XA header -- cannot fail */ vlc_stream_Read( p_demux->s, NULL, sizeof( p_xa ) ); @@ -153,6 +148,9 @@ static int Open( vlc_object_t * p_this ) date_Init( &p_sys->pts, fmt.audio.i_rate, 1 ); date_Set( &p_sys->pts, VLC_TS_0 ); + p_demux->pf_demux = Demux; + p_demux->pf_control = Control; + p_demux->p_sys = p_sys; return VLC_SUCCESS; } _______________________________________________ vlc-commits mailing list [email protected] https://mailman.videolan.org/listinfo/vlc-commits
