vlc | branch: master | Rémi Denis-Courmont <[email protected]> | Wed Aug 5 18:59:58 2015 +0300| [ea5bd4a4b2c68c79d70c2f1e77d55680f3385041] | committer: Rémi Denis-Courmont
demux: remove unused demux_meta_t.p_demux > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=ea5bd4a4b2c68c79d70c2f1e77d55680f3385041 --- include/vlc_demux.h | 1 - src/input/input.c | 5 ++--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/include/vlc_demux.h b/include/vlc_demux.h index 738a61c..e0b4c49 100644 --- a/include/vlc_demux.h +++ b/include/vlc_demux.h @@ -91,7 +91,6 @@ struct demux_t typedef struct demux_meta_t { VLC_COMMON_MEMBERS - demux_t *p_demux; /** FIXME: use stream_t instead? */ input_item_t *p_item; /***< the input item that is being read */ vlc_meta_t *p_meta; /**< meta data */ diff --git a/src/input/input.c b/src/input/input.c index a822df7..3efda10 100644 --- a/src/input/input.c +++ b/src/input/input.c @@ -2489,10 +2489,9 @@ static void InputSourceMeta( input_thread_t *p_input, return; demux_meta_t *p_demux_meta = - vlc_custom_create( p_demux, sizeof( *p_demux_meta ), "demux meta" ); - if( !p_demux_meta ) + vlc_custom_create( p_input, sizeof( *p_demux_meta ), "demux meta" ); + if( unlikely(p_demux_meta == NULL) ) return; - p_demux_meta->p_demux = p_demux; p_demux_meta->p_item = p_input->p->p_item; module_t *p_id3 = module_need( p_demux_meta, "meta reader", NULL, false ); _______________________________________________ vlc-commits mailing list [email protected] https://mailman.videolan.org/listinfo/vlc-commits
