Commit 3d86e1dd authored by Christophe Massiot's avatar Christophe Massiot

* ./src/audio_output/audio_output.c: Partially disabled what I just did

  because it might be a source of unstability on some architectures.
parent 370e8f9a
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* audio_output.c : audio output thread * audio_output.c : audio output thread
***************************************************************************** *****************************************************************************
* Copyright (C) 1999-2001 VideoLAN * Copyright (C) 1999-2001 VideoLAN
* $Id: audio_output.c,v 1.84.2.1 2002/08/07 20:42:37 massiot Exp $ * $Id: audio_output.c,v 1.84.2.2 2002/08/07 21:35:24 massiot Exp $
* *
* Authors: Michel Kaempf <maxx@via.ecp.fr> * Authors: Michel Kaempf <maxx@via.ecp.fr>
* Cyril Deguet <asmax@via.ecp.fr> * Cyril Deguet <asmax@via.ecp.fr>
...@@ -112,7 +112,10 @@ aout_thread_t *aout_CreateThread( int *pi_status, int i_channels, int i_rate ) ...@@ -112,7 +112,10 @@ aout_thread_t *aout_CreateThread( int *pi_status, int i_channels, int i_rate )
if( p_aout->i_rate == 0 ) if( p_aout->i_rate == 0 )
{ {
p_aout->i_rate = i_rate; if ( i_rate != 44100 && i_rate != 48000 )
p_aout->i_rate = 44100;
else
p_aout->i_rate = i_rate;
} }
/* Choose the best module */ /* Choose the best module */
......
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
* and spawn threads. * and spawn threads.
***************************************************************************** *****************************************************************************
* Copyright (C) 1998-2001 VideoLAN * Copyright (C) 1998-2001 VideoLAN
* $Id: main.c,v 1.195.2.6 2002/08/07 20:42:37 massiot Exp $ * $Id: main.c,v 1.195.2.7 2002/08/07 21:35:24 massiot Exp $
* *
* Authors: Vincent Seguin <seguin@via.ecp.fr> * Authors: Vincent Seguin <seguin@via.ecp.fr>
* Samuel Hocevar <sam@zoy.org> * Samuel Hocevar <sam@zoy.org>
...@@ -385,7 +385,7 @@ ADD_MODULE_WITH_SHORT ( "aout", 'A', MODULE_CAPABILITY_AOUT, NULL, NULL, AOUT_T ...@@ -385,7 +385,7 @@ ADD_MODULE_WITH_SHORT ( "aout", 'A', MODULE_CAPABILITY_AOUT, NULL, NULL, AOUT_T
ADD_BOOL ( "audio", 1, NULL, AUDIO_TEXT, AUDIO_LONGTEXT ) ADD_BOOL ( "audio", 1, NULL, AUDIO_TEXT, AUDIO_LONGTEXT )
ADD_BOOL ( "mono", 0, NULL, MONO_TEXT, MONO_LONGTEXT ) ADD_BOOL ( "mono", 0, NULL, MONO_TEXT, MONO_LONGTEXT )
ADD_INTEGER ( "volume", VOLUME_DEFAULT, NULL, VOLUME_TEXT, VOLUME_LONGTEXT ) ADD_INTEGER ( "volume", VOLUME_DEFAULT, NULL, VOLUME_TEXT, VOLUME_LONGTEXT )
ADD_INTEGER ( "rate", 0, NULL, RATE_TEXT, RATE_LONGTEXT ) ADD_INTEGER ( "rate", 44100, NULL, RATE_TEXT, RATE_LONGTEXT )
ADD_INTEGER ( "desync", 0, NULL, DESYNC_TEXT, DESYNC_LONGTEXT ) ADD_INTEGER ( "desync", 0, NULL, DESYNC_TEXT, DESYNC_LONGTEXT )
ADD_INTEGER ( "audio-format", 0, NULL, FORMAT_TEXT, FORMAT_LONGTEXT ) ADD_INTEGER ( "audio-format", 0, NULL, FORMAT_TEXT, FORMAT_LONGTEXT )
......
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