vlc | branch: master | Rémi Denis-Courmont <[email protected]> | Wed Feb 20 23:40:01 2013 +0200| [b54103b03e1f829b7d5636c37a49d43c1ac4abc5] | committer: Rémi Denis-Courmont
raw*: initialize callbacks only at success Also remove dated comment. > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=b54103b03e1f829b7d5636c37a49d43c1ac4abc5 --- modules/demux/rawaud.c | 5 ++--- modules/demux/rawdv.c | 5 ++--- modules/demux/rawvid.c | 5 ++--- 3 files changed, 6 insertions(+), 9 deletions(-) diff --git a/modules/demux/rawaud.c b/modules/demux/rawaud.c index a638777..9dd6da6 100644 --- a/modules/demux/rawaud.c +++ b/modules/demux/rawaud.c @@ -103,9 +103,6 @@ static int Open( vlc_object_t * p_this ) demux_t *p_demux = (demux_t*)p_this; demux_sys_t *p_sys; - /* Set p_input field */ - p_demux->pf_demux = Demux; - p_demux->pf_control = Control; p_demux->p_sys = p_sys = malloc( sizeof( demux_sys_t ) ); if( !p_sys ) return VLC_ENOMEM; @@ -210,6 +207,8 @@ static int Open( vlc_object_t * p_this ) p_sys->i_frame_size = p_sys->i_frame_samples * p_sys->i_seek_step; msg_Dbg( p_demux, "frame size is %d bytes ", p_sys->i_frame_size); + p_demux->pf_demux = Demux; + p_demux->pf_control = Control; return VLC_SUCCESS; } diff --git a/modules/demux/rawdv.c b/modules/demux/rawdv.c index 043cce4..62c4a15 100644 --- a/modules/demux/rawdv.c +++ b/modules/demux/rawdv.c @@ -194,9 +194,6 @@ static int Open( vlc_object_t * p_this ) p_peek += 72; /* skip rest of DIF block */ - /* Set p_input field */ - p_demux->pf_demux = Demux; - p_demux->pf_control = Control; p_demux->p_sys = p_sys = malloc( sizeof( demux_sys_t ) ); if( !p_sys ) return VLC_ENOMEM; @@ -236,6 +233,8 @@ static int Open( vlc_object_t * p_this ) p_sys->p_es_audio = es_out_Add( p_demux->out, &p_sys->fmt_audio ); } + p_demux->pf_demux = Demux; + p_demux->pf_control = Control; return VLC_SUCCESS; } diff --git a/modules/demux/rawvid.c b/modules/demux/rawvid.c index 13761de..7577b5a 100644 --- a/modules/demux/rawvid.c +++ b/modules/demux/rawvid.c @@ -169,9 +169,6 @@ static int Open( vlc_object_t * p_this ) return VLC_EGENERIC; } valid: - /* Set p_input field */ - p_demux->pf_demux = Demux; - p_demux->pf_control = Control; p_demux->p_sys = p_sys = malloc( sizeof( demux_sys_t ) ); if( !p_sys ) return VLC_ENOMEM; @@ -388,6 +385,8 @@ valid: * p_sys->fmt_video.video.i_bits_per_pixel / 8; p_sys->p_es_video = es_out_Add( p_demux->out, &p_sys->fmt_video ); + p_demux->pf_demux = Demux; + p_demux->pf_control = Control; return VLC_SUCCESS; error: _______________________________________________ vlc-commits mailing list [email protected] http://mailman.videolan.org/listinfo/vlc-commits
