Changeset 3584f174016b7eb50fb7af71e2a779d2e1abbf8d
- Timestamp:
- 25/11/02 17:16:12
(6 years ago)
- Author:
- Christophe Massiot <massiot@videolan.org>
- git-committer:
- Christophe Massiot <massiot@videolan.org> 1038240972 +0000
- git-parent:
[f9c65dc85e3b988efab122ee6b3db1226493f1ae]
- git-author:
- Christophe Massiot <massiot@videolan.org> 1038240972 +0000
- Message:
Fixed my fix :p.
-
Files:
-
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
| rf9c65dc |
r3584f17 |
|
| 3 | 3 | ***************************************************************************** |
|---|
| 4 | 4 | * Copyright (C) 2002 VideoLAN |
|---|
| 5 | | * $Id: input.c,v 1.23 2002/11/25 16:00:26 massiot Exp $ |
|---|
| | 5 | * $Id: input.c,v 1.24 2002/11/25 16:16:12 massiot Exp $ |
|---|
| 6 | 6 | * |
|---|
| 7 | 7 | * Authors: Christophe Massiot <massiot@via.ecp.fr> |
|---|
| … | … | |
| 177 | 177 | msg_Warn( p_aout, "timing screwed, stopping resampling" ); |
|---|
| 178 | 178 | p_input->i_resampling_type = AOUT_RESAMPLING_NONE; |
|---|
| 179 | | if ( i_nb_resamplers != 0 ) |
|---|
| | 179 | if ( p_input->i_nb_resamplers != 0 ) |
|---|
| 180 | 180 | { |
|---|
| 181 | 181 | p_input->pp_resamplers[0]->input.i_rate = p_input->input.i_rate; |
|---|
| … | … | |
| 207 | 207 | ( start_date < p_buffer->start_date - AOUT_PTS_TOLERANCE |
|---|
| 208 | 208 | || start_date > p_buffer->start_date + AOUT_PTS_TOLERANCE ) && |
|---|
| 209 | | i_nb_resamplers > 0 ) |
|---|
| | 209 | p_input->i_nb_resamplers > 0 ) |
|---|
| 210 | 210 | { |
|---|
| 211 | 211 | /* Can happen in several circumstances : |
|---|
| … | … | |
| 286 | 286 | |
|---|
| 287 | 287 | /* Actually run the resampler now. */ |
|---|
| 288 | | if ( i_nb_resamplers > 0 && p_aout->mixer.mixer.i_rate != |
|---|
| | 288 | if ( p_input->i_nb_resamplers > 0 && p_aout->mixer.mixer.i_rate != |
|---|
| 289 | 289 | p_input->pp_resamplers[0]->input.i_rate ) |
|---|
| 290 | 290 | { |
|---|