* Backported my two previous commits.

diff --git a/plugins/a52/a52.c b/plugins/a52/a52.c
index f0aa9b22341af731efd9b73962819adbc2c40843..9431af6b62d5313338808ddc8d6c6230eb0c7705 100644 (file)
--- a/plugins/a52/a52.c
+++ b/plugins/a52/a52.c
@@ -4,7 +4,7 @@
  *   (http://liba52.sf.net/).
  *****************************************************************************
  * 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>
  *      
@@ -28,7 +28,7 @@
  *****************************************************************************/
 #include <stdlib.h>                                      /* malloc(), free() */
 #include <string.h>                                              /* strdup() */
-#include <stdint.h>                                            /* int16_t .. */
+#include <inttypes.h>                                          /* int16_t .. */
 
 #include <videolan/vlc.h>
 

diff --git a/plugins/satellite/satellite_tools.c b/plugins/satellite/satellite_tools.c
index dfc482601cdcc3a953e542c8affee7aac0e86f1f..77d45e0e197d4666d7a1ef41becd74935cd794c2 100644 (file)
--- a/plugins/satellite/satellite_tools.c
+++ b/plugins/satellite/satellite_tools.c
@@ -23,7 +23,7 @@
 
 #include <sys/ioctl.h>
 #include <stdio.h>
-#include <stdint.h>
+#include <inttypes.h>
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <fcntl.h>

diff --git a/plugins/sdl/aout_sdl.c b/plugins/sdl/aout_sdl.c
index 2150b7e3afbb5c0f41b4f2088a10a7619f08d79b..ed54380bbbf7fa1a4f8ffa0bbbaea1bcdf7d930e 100644 (file)
--- a/plugins/sdl/aout_sdl.c
+++ b/plugins/sdl/aout_sdl.c
@@ -2,7 +2,7 @@
  * aout_sdl.c : audio sdl functions library
  *****************************************************************************
  * 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>
  *          Samuel Hocevar <sam@zoy.org>
@@ -133,7 +133,11 @@ static int aout_Open( aout_thread_t *p_aout )
     /* TODO: write conversion beetween AOUT_FORMAT_DEFAULT
      * AND AUDIO* from SDL. */
     desired.freq       = p_aout->i_rate;
+#ifdef WORDS_BIGENDIAN
+    desired.format     = AUDIO_S16MSB;                     /* stereo 16 bits */
+#else
     desired.format     = AUDIO_S16LSB;                     /* stereo 16 bits */
+#endif
     desired.channels   = p_aout->i_channels;
     desired.callback   = aout_SDLCallback;
     desired.userdata   = p_aout->p_sys;
@@ -173,7 +177,11 @@ static int aout_SetFormat( aout_thread_t *p_aout )
 
     /*i_format = p_aout->i_format;*/
     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 */
+#endif
     desired.channels   = p_aout->i_channels;
     desired.callback   = aout_SDLCallback;
     desired.userdata   = p_aout->p_sys;