Skip to content

V
vlc-2-2
Commit 7fb39a20 authored by Sam Hocevar's avatar Sam Hocevar
Browse files
Options

* ./src/audio_output/input.c: fixed a side-effect problem in buffer dates 

    recalculation (spotted by KKI).
parent a7a66d7a
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 3 deletions
src/audio_output/input.c
View file @ 7fb39a20
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* input.c : internal management of input streams for the audio output * input.c : internal management of input streams for the audio output
***************************************************************************** *****************************************************************************
* Copyright (C) 2002 VideoLAN * Copyright (C) 2002 VideoLAN
* $Id: input.c,v 1.27 2002/12/09 00:52:42 babal Exp $ * $Id: input.c,v 1.28 2002/12/22 17:08:42 sam Exp $
* *
* Authors: Christophe Massiot <massiot@via.ecp.fr> * Authors: Christophe Massiot <massiot@via.ecp.fr>
* *
...@@ -326,13 +326,12 @@ int aout_InputPlay( aout_instance_t * p_aout, aout_input_t * p_input, ...@@ -326,13 +326,12 @@ int aout_InputPlay( aout_instance_t * p_aout, aout_input_t * p_input,
p_input->i_resampling_type = AOUT_RESAMPLING_NONE; p_input->i_resampling_type = AOUT_RESAMPLING_NONE;
p_input->pp_resamplers[0]->input.i_rate = p_input->input.i_rate; p_input->pp_resamplers[0]->input.i_rate = p_input->input.i_rate;
} }
} }
/* Adding the start date will be managed by aout_FifoPush(). */ /* Adding the start date will be managed by aout_FifoPush(). */
p_buffer->start_date = start_date;
p_buffer->end_date = start_date + p_buffer->end_date = start_date +
(p_buffer->end_date - p_buffer->start_date); (p_buffer->end_date - p_buffer->start_date);
p_buffer->start_date = start_date;
/* Actually run the resampler now. */ /* Actually run the resampler now. */
if ( p_input->i_nb_resamplers > 0 && p_aout->mixer.mixer.i_rate != if ( p_input->i_nb_resamplers > 0 && p_aout->mixer.mixer.i_rate !=
......
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