* Do not take and release the structure lock for each element of the list while

[vlc] / src / input / input.c

diff --git a/src/input/input.c b/src/input/input.c
index 8e327b51a65ac29aaf8a9b5cc1cd6e29cd1edeab..ec1a3f025e6642be555a48ffbf2e235e64efa415 100644 (file)
--- a/src/input/input.c
+++ b/src/input/input.c
@@ -197,7 +197,9 @@ static input_thread_t *Create( vlc_object_t *p_parent, input_item_t *p_item,
     input_ConfigVarInit( p_input );
 
     /* Create Objects variables for public Get and Set */
-    input_ControlVarInit( p_input );
+    if( !p_input->b_preparsing )
+        input_ControlVarInit( p_input );
+
     p_input->p->input.i_cr_average = var_GetInteger( p_input, "cr-average" );
 
     if( !p_input->b_preparsing )
@@ -1147,7 +1149,8 @@ static void End( input_thread_t * p_input )
     input_ChangeState( p_input, END_S );
 
     /* Clean control variables */
-    input_ControlVarClean( p_input );
+    if( !p_input->b_preparsing )
+        input_ControlVarClean( p_input );
 
     /* Clean up master */
     InputSourceClean( p_input, &p_input->p->input );