[vlc-devel] commit: vmem: better ordering. ( Rémi Duraffort )

[git version control]

vlc | branch: master | Rémi Duraffort <ivoire at videolan.org> | Thu Jul 16 09:52:18 2009 +0200| [dd12032d9001068f402f414faad408b9bf37a62f] | committer: Rémi Duraffort 

vmem: better ordering.

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=dd12032d9001068f402f414faad408b9bf37a62f
---

 modules/video_output/vmem.c |    9 +++++----
 1 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/modules/video_output/vmem.c b/modules/video_output/vmem.c
index 57e0530..e4858c2 100644
--- a/modules/video_output/vmem.c
+++ b/modules/video_output/vmem.c
@@ -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 );
     free( psz_tmp );
 
-    psz_tmp = var_CreateGetString( p_vout, "vmem-data" );
-    p_vout->p_sys->p_data = (void *)(intptr_t)atoll( psz_tmp );
-    free( psz_tmp );
-
+    /* pf_lock and pf_unlock are mandatory */
     if( !p_vout->p_sys->pf_lock || !p_vout->p_sys->pf_unlock )
     {
         msg_Err( p_vout, "Invalid lock or unlock callbacks" );
         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;
 
     /* Initialize the output structure */