Skip to content

V
vlc-2-2
Commit dd12032d authored by Rémi Duraffort's avatar Rémi Duraffort
Browse files
Options

vmem: better ordering.

parent 63a67c18
Hide whitespace changes
Inline Side-by-side
Showing with 5 additions and 4 deletions
modules/video_output/vmem.c
View file @ dd12032d
...@@ -164,16 +164,17 @@ static int Init( vout_thread_t *p_vout ) ...@@ -164,16 +164,17 @@ static int Init( vout_thread_t *p_vout )
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 = var_CreateGetString( p_vout, "vmem-data" ); /* pf_lock and pf_unlock are mandatory */
p_vout->p_sys->p_data = (void *)(intptr_t)atoll( psz_tmp );
free( psz_tmp );
if( !p_vout->p_sys->pf_lock || !p_vout->p_sys->pf_unlock ) if( !p_vout->p_sys->pf_lock || !p_vout->p_sys->pf_unlock )
{ {
msg_Err( p_vout, "Invalid lock or unlock callbacks" ); msg_Err( p_vout, "Invalid lock or unlock callbacks" );
return VLC_EGENERIC; return VLC_EGENERIC;
} }
psz_tmp = var_CreateGetString( p_vout, "vmem-data" );
p_vout->p_sys->p_data = (void *)(intptr_t)atoll( psz_tmp );
free( psz_tmp );
I_OUTPUTPICTURES = 0; I_OUTPUTPICTURES = 0;
/* Initialize the output structure */ /* Initialize the output structure */
......
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