Commit 108467bf authored by Christophe Massiot's avatar Christophe Massiot

* Backported my two previous commits.

parent da0187a3
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
* (http://liba52.sf.net/). * (http://liba52.sf.net/).
***************************************************************************** *****************************************************************************
* Copyright (C) 2001 VideoLAN * Copyright (C) 2001 VideoLAN
* $Id: a52.c,v 1.14 2002/05/30 08:17:04 gbazin Exp $ * $Id: a52.c,v 1.14.2.1 2002/05/31 21:57:51 massiot Exp $
* *
* Authors: Gildas Bazin <gbazin@netcourrier.com> * Authors: Gildas Bazin <gbazin@netcourrier.com>
* *
...@@ -28,7 +28,7 @@ ...@@ -28,7 +28,7 @@
*****************************************************************************/ *****************************************************************************/
#include <stdlib.h> /* malloc(), free() */ #include <stdlib.h> /* malloc(), free() */
#include <string.h> /* strdup() */ #include <string.h> /* strdup() */
#include <stdint.h> /* int16_t .. */ #include <inttypes.h> /* int16_t .. */
#include <videolan/vlc.h> #include <videolan/vlc.h>
......
...@@ -23,7 +23,7 @@ ...@@ -23,7 +23,7 @@
#include <sys/ioctl.h> #include <sys/ioctl.h>
#include <stdio.h> #include <stdio.h>
#include <stdint.h> #include <inttypes.h>
#include <sys/types.h> #include <sys/types.h>
#include <sys/stat.h> #include <sys/stat.h>
#include <fcntl.h> #include <fcntl.h>
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* aout_sdl.c : audio sdl functions library * aout_sdl.c : audio sdl functions library
***************************************************************************** *****************************************************************************
* Copyright (C) 1999-2001 VideoLAN * Copyright (C) 1999-2001 VideoLAN
* $Id: aout_sdl.c,v 1.27 2002/02/24 22:06:50 sam Exp $ * $Id: aout_sdl.c,v 1.27.2.1 2002/05/31 21:57:51 massiot Exp $
* *
* Authors: Michel Kaempf <maxx@via.ecp.fr> * Authors: Michel Kaempf <maxx@via.ecp.fr>
* Samuel Hocevar <sam@zoy.org> * Samuel Hocevar <sam@zoy.org>
...@@ -133,7 +133,11 @@ static int aout_Open( aout_thread_t *p_aout ) ...@@ -133,7 +133,11 @@ static int aout_Open( aout_thread_t *p_aout )
/* TODO: write conversion beetween AOUT_FORMAT_DEFAULT /* TODO: write conversion beetween AOUT_FORMAT_DEFAULT
* AND AUDIO* from SDL. */ * AND AUDIO* from SDL. */
desired.freq = p_aout->i_rate; desired.freq = p_aout->i_rate;
#ifdef WORDS_BIGENDIAN
desired.format = AUDIO_S16MSB; /* stereo 16 bits */
#else
desired.format = AUDIO_S16LSB; /* stereo 16 bits */ desired.format = AUDIO_S16LSB; /* stereo 16 bits */
#endif
desired.channels = p_aout->i_channels; desired.channels = p_aout->i_channels;
desired.callback = aout_SDLCallback; desired.callback = aout_SDLCallback;
desired.userdata = p_aout->p_sys; desired.userdata = p_aout->p_sys;
...@@ -173,7 +177,11 @@ static int aout_SetFormat( aout_thread_t *p_aout ) ...@@ -173,7 +177,11 @@ static int aout_SetFormat( aout_thread_t *p_aout )
/*i_format = p_aout->i_format;*/ /*i_format = p_aout->i_format;*/
desired.freq = p_aout->i_rate; /* Set the output rate */ desired.freq = p_aout->i_rate; /* Set the output rate */
#ifdef WORDS_BIGENDIAN
desired.format = AUDIO_S16MSB; /* stereo 16 bits */
#else
desired.format = AUDIO_S16LSB; /* stereo 16 bits */ desired.format = AUDIO_S16LSB; /* stereo 16 bits */
#endif
desired.channels = p_aout->i_channels; desired.channels = p_aout->i_channels;
desired.callback = aout_SDLCallback; desired.callback = aout_SDLCallback;
desired.userdata = p_aout->p_sys; desired.userdata = p_aout->p_sys;
......
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