Skip to content

V
vlc-1.1
Commit a49efd30 authored by Gildas Bazin's avatar Gildas Bazin
Browse files
Options

* src/input/input.c: re-enabled the --bookmarks option.

parent 52d745d0
Show whitespace changes
Inline Side-by-side
Showing with 2 additions and 3 deletions
src/input/input.c
View file @ a49efd30
...@@ -104,6 +104,7 @@ input_thread_t *__input_CreateThread( vlc_object_t *p_parent, ...@@ -104,6 +104,7 @@ input_thread_t *__input_CreateThread( vlc_object_t *p_parent,
{ {
input_thread_t *p_input; /* thread descriptor */ input_thread_t *p_input; /* thread descriptor */
vlc_value_t val;
int i; int i;
/* Allocate descriptor */ /* Allocate descriptor */
...@@ -168,7 +169,6 @@ input_thread_t *__input_CreateThread( vlc_object_t *p_parent, ...@@ -168,7 +169,6 @@ input_thread_t *__input_CreateThread( vlc_object_t *p_parent,
input_ControlVarInit( p_input ); input_ControlVarInit( p_input );
p_input->input.i_cr_average = var_GetInteger( p_input, "cr-average" ); p_input->input.i_cr_average = var_GetInteger( p_input, "cr-average" );
#if 0
/* TODO */ /* TODO */
var_Get( p_input, "bookmarks", &val ); var_Get( p_input, "bookmarks", &val );
if( val.psz_string ) if( val.psz_string )
...@@ -216,7 +216,6 @@ input_thread_t *__input_CreateThread( vlc_object_t *p_parent, ...@@ -216,7 +216,6 @@ input_thread_t *__input_CreateThread( vlc_object_t *p_parent,
} }
free( val.psz_string ); free( val.psz_string );
} }
#endif
/* Now we can attach our new input */ /* Now we can attach our new input */
vlc_object_attach( p_input, p_parent ); vlc_object_attach( p_input, p_parent );
......
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