vlc | branch: master | Rémi Denis-Courmont <[email protected]> | Mon Nov 17 18:16:15 2014 +0200| [f133cc098882418c261079e5600a3db994d509fc] | committer: Rémi Denis-Courmont
gvp: remove unused p_sys > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=f133cc098882418c261079e5600a3db994d509fc --- modules/demux/playlist/gvp.c | 23 ----------------------- modules/demux/playlist/playlist.c | 2 +- 2 files changed, 1 insertion(+), 24 deletions(-) diff --git a/modules/demux/playlist/gvp.c b/modules/demux/playlist/gvp.c index c59240a..5b17967 100644 --- a/modules/demux/playlist/gvp.c +++ b/modules/demux/playlist/gvp.c @@ -59,11 +59,6 @@ description:The now infamous Apple Macintosh commercial aired during the 1984 Su #define MAX_LINE 1024 -struct demux_sys_t -{ - input_item_t *p_current_input; -}; - /***************************************************************************** * Local prototypes *****************************************************************************/ @@ -95,28 +90,12 @@ int Import_GVP( vlc_object_t *p_this ) msg_Dbg( p_this, "using Google Video Playlist (gvp) import" ); p_demux->pf_control = Control; p_demux->pf_demux = Demux; - p_demux->p_sys = malloc( sizeof( demux_sys_t ) ); - if( !p_demux->p_sys ) - return VLC_ENOMEM; return VLC_SUCCESS; } -/***************************************************************************** - * Deactivate: frees unused data - *****************************************************************************/ -void Close_GVP( vlc_object_t *p_this ) -{ - demux_t *p_demux = (demux_t *)p_this; - demux_sys_t *p_sys = p_demux->p_sys; - - free( p_sys ); -} - static int Demux( demux_t *p_demux ) { - demux_sys_t *p_sys = p_demux->p_sys; - char *psz_line; char *psz_attrvalue; @@ -131,8 +110,6 @@ static int Demux( demux_t *p_demux ) input_item_node_t *p_subitems = input_item_node_Create( p_current_input ); - p_sys->p_current_input = p_current_input; - while( ( psz_line = stream_ReadLine( p_demux->s ) ) ) { if( *psz_line == '#' ) diff --git a/modules/demux/playlist/playlist.c b/modules/demux/playlist/playlist.c index 076d4fe..0d0e794 100644 --- a/modules/demux/playlist/playlist.c +++ b/modules/demux/playlist/playlist.c @@ -124,7 +124,7 @@ vlc_module_begin () set_description( N_("Google Video Playlist importer") ) add_shortcut( "playlist", "gvp" ) set_capability( "demux", 10 ) - set_callbacks( Import_GVP, Close_GVP ) + set_callbacks( Import_GVP, NULL ) add_submodule () set_description( N_("Dummy IFO demux") ) add_shortcut( "playlist" ) _______________________________________________ vlc-commits mailing list [email protected] https://mailman.videolan.org/listinfo/vlc-commits
