6 files changed, 5 insertions, 13 deletions
diff --git a/libao2/ao_ivtv.c b/libao2/ao_ivtv.c
index 4d1d578ba0..0c7ec22384 100644
--- a/libao2/ao_ivtv.c
+++ b/libao2/ao_ivtv.c
@@ -147,7 +147,7 @@ get_space (void)
 static int
 play (void *data, int len, int flags)
 {
-  extern int ivtv_write (unsigned char *data, int len);
+  extern int ivtv_write (const unsigned char *data, int len);
   
   if (ao_data.format != AF_FORMAT_MPEG2)
     return 0;
diff --git a/libao2/ao_mpegpes.c b/libao2/ao_mpegpes.c
index 14918d467e..583ca44cf5 100644
--- a/libao2/ao_mpegpes.c
+++ b/libao2/ao_mpegpes.c
@@ -188,7 +188,7 @@ static int preinit(const char *arg)
 	return vo_mpegpes_fd2;
 }
 
-static int my_ao_write(unsigned char* data,int len){
+static int my_ao_write(const unsigned char* data,int len){
     int orig_len = len;
 #ifdef CONFIG_DVB
 #define NFD   1
@@ -283,8 +283,6 @@ static void audio_resume(void)
 {
 }
 
-void send_pes_packet(unsigned char* data,int len,int id,int timestamp);
-void send_lpcm_packet(unsigned char* data,int len,int id,int timestamp,int freq_id);
 extern int vo_pts;
 
 // return: how many bytes can be played without blocking
diff --git a/libao2/ao_sdl.c b/libao2/ao_sdl.c
index 292972514c..2da0073da7 100644
--- a/libao2/ao_sdl.c
+++ b/libao2/ao_sdl.c
@@ -159,7 +159,7 @@ static int control(int cmd,void *arg){
 }
 
 // SDL Callback function
-void outputaudio(void *unused, Uint8 *stream, int len) {
+static void outputaudio(void *unused, Uint8 *stream, int len) {
 	//SDL_MixAudio(stream, read_buffer(buffers, len), len, SDL_MIX_MAXVOLUME);
 	//if(!full_buffers) printf("SDL: Buffer underrun!\n");
 
diff --git a/libao2/ao_v4l2.c b/libao2/ao_v4l2.c
index dc63003b06..4f57d81944 100644
--- a/libao2/ao_v4l2.c
+++ b/libao2/ao_v4l2.c
@@ -144,7 +144,7 @@ get_space (void)
 static int
 play (void *data, int len, int flags)
 {
-  extern int v4l2_write (unsigned char *data, int len);
+  extern int v4l2_write (const unsigned char *data, int len);
   
   if (ao_data.format != AF_FORMAT_MPEG2)
     return 0;
diff --git a/libao2/audio_out.c b/libao2/audio_out.c
index 38fad281be..71ebf94c82 100644
--- a/libao2/audio_out.c
+++ b/libao2/audio_out.c
@@ -7,7 +7,6 @@
 
 #include "mp_msg.h"
 #include "help_mp.h"
-#include "mplayer.h" /* for exit_player() */
 
 // there are some globals:
 ao_data_t ao_data={0,0,0,0,OUTBURST,-1,0};
@@ -119,10 +118,6 @@ const ao_functions_t* init_best_audio_out(char** ao_list,int use_plugin,int rate
       while(ao_list[0][0]){
         char* ao=ao_list[0];
         int ao_len;
-        if (strncmp(ao, "alsa9", 5) == 0 || strncmp(ao, "alsa1x", 6) == 0) {
-            mp_msg(MSGT_AO, MSGL_FATAL, MSGTR_AO_ALSA9_1x_Removed);
-            exit_player(NULL);
-        }
         if (ao_subdevice) {
             free(ao_subdevice);
             ao_subdevice = NULL;
diff --git a/libao2/audio_out.h b/libao2/audio_out.h
index 5fad397313..59811f2754 100644
--- a/libao2/audio_out.h
+++ b/libao2/audio_out.h
@@ -29,8 +29,7 @@ typedef struct ao_functions_s
 } ao_functions_t;
 
 /* global data used by mplayer and plugins */
-typedef struct ao_data_s
-{
+typedef struct ao_data {
   int samplerate;
   int channels;
   int format;