Commit f2e6cfee authored by Joseph Tulou's avatar Joseph Tulou Committed by Rémi Denis-Courmont

change in vmem to allow multiple inputs (libvlc api)

Signed-off-by: default avatarRémi Denis-Courmont <rdenis@simphalempin.com>
parent bbff06b0
...@@ -135,11 +135,11 @@ static int Init( vout_thread_t *p_vout ) ...@@ -135,11 +135,11 @@ static int Init( vout_thread_t *p_vout )
char *psz_chroma, *psz_tmp; char *psz_chroma, *psz_tmp;
int i_width, i_height, i_pitch, i_chroma; int i_width, i_height, i_pitch, i_chroma;
i_width = config_GetInt( p_vout, "vmem-width" ); i_width = var_CreateGetInteger( p_vout, "vmem-width" );
i_height = config_GetInt( p_vout, "vmem-height" ); i_height = var_CreateGetInteger( p_vout, "vmem-height" );
i_pitch = config_GetInt( p_vout, "vmem-pitch" ); i_pitch = var_CreateGetInteger( p_vout, "vmem-pitch" );
psz_chroma = config_GetPsz( p_vout, "vmem-chroma" ); psz_chroma = var_CreateGetString( p_vout, "vmem-chroma" );
if( psz_chroma ) if( psz_chroma )
{ {
if( strlen( psz_chroma ) < 4 ) if( strlen( psz_chroma ) < 4 )
...@@ -158,15 +158,15 @@ static int Init( vout_thread_t *p_vout ) ...@@ -158,15 +158,15 @@ static int Init( vout_thread_t *p_vout )
return VLC_EGENERIC; return VLC_EGENERIC;
} }
psz_tmp = config_GetPsz( p_vout, "vmem-lock" ); psz_tmp = var_CreateGetString( p_vout, "vmem-lock" );
p_vout->p_sys->pf_lock = (void * (*) (void *))(intptr_t)atoll( psz_tmp ); p_vout->p_sys->pf_lock = (void (*) (void *, void **))(intptr_t)atoll( psz_tmp );
free( psz_tmp ); free( psz_tmp );
psz_tmp = config_GetPsz( p_vout, "vmem-unlock" ); psz_tmp = var_CreateGetString( p_vout, "vmem-unlock" );
p_vout->p_sys->pf_unlock = (void (*) (void *))(intptr_t)atoll( psz_tmp ); p_vout->p_sys->pf_unlock = (void (*) (void *))(intptr_t)atoll( psz_tmp );
free( psz_tmp ); free( psz_tmp );
psz_tmp = config_GetPsz( p_vout, "vmem-data" ); psz_tmp = var_CreateGetString( p_vout, "vmem-data" );
p_vout->p_sys->p_data = (void *)(intptr_t)atoll( psz_tmp ); p_vout->p_sys->p_data = (void *)(intptr_t)atoll( psz_tmp );
free( psz_tmp ); free( psz_tmp );
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment