vlc | branch: master | Rémi Denis-Courmont <[email protected]> | Tue Feb 19 22:06:47 2019 +0200| [9a30080a85f6722d410f243263f4eac95e75920f] | committer: Rémi Denis-Courmont
vlm: parent media instance to media > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=9a30080a85f6722d410f243263f4eac95e75920f --- src/input/vlm.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/input/vlm.c b/src/input/vlm.c index 54985547e4..3b22b42f15 100644 --- a/src/input/vlm.c +++ b/src/input/vlm.c @@ -867,7 +867,8 @@ static vlm_media_instance_sys_t *vlm_ControlMediaInstanceGetByName( vlm_media_sy } return NULL; } -static vlm_media_instance_sys_t *vlm_MediaInstanceNew( vlm_t *p_vlm, const char *psz_name ) + +static vlm_media_instance_sys_t *vlm_MediaInstanceNew( vlm_media_sys_t *p_media, const char *psz_name ) { vlm_media_instance_sys_t *p_instance = calloc( 1, sizeof(vlm_media_instance_sys_t) ); if( !p_instance ) @@ -881,7 +882,7 @@ static vlm_media_instance_sys_t *vlm_MediaInstanceNew( vlm_t *p_vlm, const char p_instance->i_index = 0; p_instance->b_sout_keep = false; - p_instance->p_parent = vlc_object_create( p_vlm, sizeof (vlc_object_t) ); + p_instance->p_parent = vlc_object_create( p_media, sizeof (vlc_object_t) ); p_instance->p_input = NULL; p_instance->p_input_resource = input_resource_New( p_instance->p_parent ); @@ -930,7 +931,7 @@ static int vlm_ControlMediaInstanceStart( vlm_t *p_vlm, int64_t id, const char * { vlm_media_t *p_cfg = &p_media->cfg; - p_instance = vlm_MediaInstanceNew( p_vlm, psz_id ); + p_instance = vlm_MediaInstanceNew( p_media, psz_id ); if( !p_instance ) return VLC_ENOMEM; _______________________________________________ vlc-commits mailing list [email protected] https://mailman.videolan.org/listinfo/vlc-commits
