vlc | branch: master | Rémi Denis-Courmont <[email protected]> | Tue Oct 20 19:07:37 2015 +0300| [f788fa20e1700762351f06fd071c05112db8095e] | committer: Rémi Denis-Courmont
access: fix ACCESS_GET_META and STREAM_GET_META mismatches > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=f788fa20e1700762351f06fd071c05112db8095e --- include/vlc_access.h | 2 +- include/vlc_stream.h | 2 +- modules/access/vcdx/access.c | 4 ++-- modules/access/vdr.c | 2 -- 4 files changed, 4 insertions(+), 6 deletions(-) diff --git a/include/vlc_access.h b/include/vlc_access.h index 964fbfd..6663c08 100644 --- a/include/vlc_access.h +++ b/include/vlc_access.h @@ -52,7 +52,7 @@ enum access_query_e ACCESS_GET_SEEKPOINT, /* arg1=unsigned * res=can fail */ /* Meta data */ - ACCESS_GET_META, /* arg1= vlc_meta_t ** res=can fail */ + ACCESS_GET_META, /* arg1= vlc_meta_t * res=can fail */ ACCESS_GET_CONTENT_TYPE,/* arg1=char **ppsz_content_type res=can fail */ ACCESS_GET_SIGNAL, /* arg1=double *pf_quality, arg2=double *pf_strength res=can fail */ diff --git a/include/vlc_stream.h b/include/vlc_stream.h index e29cf5b..d783487 100644 --- a/include/vlc_stream.h +++ b/include/vlc_stream.h @@ -87,7 +87,7 @@ enum stream_query_e STREAM_GET_TITLE_INFO, /**< arg1=input_title_t*** arg2=int* res=can fail */ STREAM_GET_TITLE, /**< arg1=unsigned * res=can fail */ STREAM_GET_SEEKPOINT, /**< arg1=unsigned * res=can fail */ - STREAM_GET_META, /**< arg1= vlc_meta_t ** res=can fail */ + STREAM_GET_META, /**< arg1= vlc_meta_t * res=can fail */ STREAM_GET_CONTENT_TYPE, /**< arg1= char ** res=can fail */ STREAM_GET_SIGNAL, /**< arg1=double *pf_quality, arg2=double *pf_strength res=can fail */ diff --git a/modules/access/vcdx/access.c b/modules/access/vcdx/access.c index 8dad04e..7298b0f 100644 --- a/modules/access/vcdx/access.c +++ b/modules/access/vcdx/access.c @@ -964,9 +964,9 @@ static int VCDControl( access_t *p_access, int i_query, va_list args ) dbg_print( INPUT_DBG_EVENT, "get meta info" ); if( p_vcdplayer->p_meta ) { - vlc_meta_t **pp_meta = (vlc_meta_t**)va_arg(args,vlc_meta_t**); + vlc_meta_t *p_meta = va_arg(args,vlc_meta_t *); - *pp_meta = vlc_meta_Duplicate( p_vcdplayer->p_meta ); + vlc_meta_Merge( p_meta, p_vcdplayer->p_meta ); dbg_print( INPUT_DBG_META, "%s", "Meta copied" ); } else diff --git a/modules/access/vdr.c b/modules/access/vdr.c index 3866595..d2d840e 100644 --- a/modules/access/vdr.c +++ b/modules/access/vdr.c @@ -324,8 +324,6 @@ static int Control( access_t *p_access, int i_query, va_list args ) return Seek( p_access, p_sys->offsets[i] ); case ACCESS_GET_META: - if( !p_sys->p_meta ) - return VLC_EGENERIC; p_meta = va_arg( args, vlc_meta_t* ); vlc_meta_Merge( p_meta, p_sys->p_meta ); break; _______________________________________________ vlc-commits mailing list [email protected] https://mailman.videolan.org/listinfo/vlc-commits
