Skip to content

V
vlc-1.1
Commit eee921c0 authored by Christophe Massiot's avatar Christophe Massiot
Browse files
Options

* src/input/input.c: Put less picky fallback values for pts_delay and 

   cr_average.
parent 93a0a44c
Show whitespace changes
Inline Side-by-side
Showing with 3 additions and 3 deletions
src/input/input.c
View file @ eee921c0
...@@ -665,8 +665,8 @@ static int Init( input_thread_t * p_input, vlc_bool_t b_quick ) ...@@ -665,8 +665,8 @@ static int Init( input_thread_t * p_input, vlc_bool_t b_quick )
p_input->b_can_pause = p_input->input.b_can_pause; p_input->b_can_pause = p_input->input.b_can_pause;
/* Fix pts delay */ /* Fix pts delay */
if( p_input->i_pts_delay <= 0 ) if( p_input->i_pts_delay < 0 )
p_input->i_pts_delay = DEFAULT_PTS_DELAY; p_input->i_pts_delay = 0;
/* If the desynchronisation requested by the user is < 0, we need to /* If the desynchronisation requested by the user is < 0, we need to
* cache more data. */ * cache more data. */
...@@ -676,7 +676,7 @@ static int Init( input_thread_t * p_input, vlc_bool_t b_quick ) ...@@ -676,7 +676,7 @@ static int Init( input_thread_t * p_input, vlc_bool_t b_quick )
/* Update cr_average depending on the caching */ /* Update cr_average depending on the caching */
p_input->input.i_cr_average *= (10 * p_input->i_pts_delay / 200000); p_input->input.i_cr_average *= (10 * p_input->i_pts_delay / 200000);
p_input->input.i_cr_average /= 10; p_input->input.i_cr_average /= 10;
if( p_input->input.i_cr_average <= 0 ) p_input->input.i_cr_average = 1; if( p_input->input.i_cr_average < 10 ) p_input->input.i_cr_average = 10;
} }
/* Load master infos */ /* Load master infos */
......
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