]> git.sesse.net Git - vlc/commitdiff
audiotrack: fix crash
authorThomas Guillem <thomas@gllm.fr>
Thu, 5 Mar 2015 16:17:50 +0000 (17:17 +0100)
committerJean-Baptiste Kempf <jb@videolan.org>
Thu, 5 Mar 2015 17:45:36 +0000 (18:45 +0100)
Create the thread after p_aout->sys is set.

Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>
modules/audio_output/audiotrack.c

index e21e31ea43d643fa91852396851a5a01bd0bbdad..7ac723a927364a849fbbae27605feadb32dcb21d 100644 (file)
@@ -1211,6 +1211,16 @@ Open( vlc_object_t *obj )
     vlc_cond_init( &p_sys->cond );
     TAILQ_INIT( &p_sys->thread_cmd_queue );
 
+    p_aout->sys = p_sys;
+    p_aout->start = Start;
+    p_aout->stop = Stop;
+    p_aout->play = Play;
+    p_aout->pause = Pause;
+    p_aout->flush = Flush;
+    p_aout->time_get = TimeGet;
+
+    aout_SoftVolumeInit( p_aout );
+
     /* create JNIThread */
     p_sys->b_thread_run = true;
     if( vlc_clone( &p_sys->thread,
@@ -1222,16 +1232,6 @@ Open( vlc_object_t *obj )
         return VLC_EGENERIC;
     }
 
-    p_aout->sys = p_sys;
-    p_aout->start = Start;
-    p_aout->stop = Stop;
-    p_aout->play = Play;
-    p_aout->pause = Pause;
-    p_aout->flush = Flush;
-    p_aout->time_get = TimeGet;
-
-    aout_SoftVolumeInit( p_aout );
-
     return VLC_SUCCESS;
 }