summaryrefslogtreecommitdiffstats
path: root/libao2
diff options
context:
space:
mode:
authorreimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2>2009-03-06 19:58:16 +0000
committerreimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2>2009-03-06 19:58:16 +0000
commit54c1d8319764c34ea3928295412ac69e73d43cab (patch)
treebe2231baf00591f75bbf8d5ba64c8823afe0a200 /libao2
parentd6bf2e318e785f1ddaf4f3ecd61ec780eca5bb24 (diff)
downloadmpv-54c1d8319764c34ea3928295412ac69e73d43cab.tar.bz2
mpv-54c1d8319764c34ea3928295412ac69e73d43cab.tar.xz
Make audio_out_* structs const so they end up in .rodata
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28859 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libao2')
-rw-r--r--libao2/audio_out.c46
-rw-r--r--libao2/audio_out_internal.h2
2 files changed, 24 insertions, 24 deletions
diff --git a/libao2/audio_out.c b/libao2/audio_out.c
index 222349ccf9..0e26e761fa 100644
--- a/libao2/audio_out.c
+++ b/libao2/audio_out.c
@@ -31,29 +31,29 @@
ao_data_t ao_data={0,0,0,0,OUTBURST,-1,0};
char *ao_subdevice = NULL;
-extern ao_functions_t audio_out_oss;
-extern ao_functions_t audio_out_macosx;
-extern ao_functions_t audio_out_arts;
-extern ao_functions_t audio_out_esd;
-extern ao_functions_t audio_out_pulse;
-extern ao_functions_t audio_out_jack;
-extern ao_functions_t audio_out_openal;
-extern ao_functions_t audio_out_null;
-extern ao_functions_t audio_out_alsa5;
-extern ao_functions_t audio_out_alsa;
-extern ao_functions_t audio_out_nas;
-extern ao_functions_t audio_out_sdl;
-extern ao_functions_t audio_out_sun;
-extern ao_functions_t audio_out_sgi;
-extern ao_functions_t audio_out_win32;
-extern ao_functions_t audio_out_dsound;
-extern ao_functions_t audio_out_dart;
-extern ao_functions_t audio_out_dxr2;
-extern ao_functions_t audio_out_ivtv;
-extern ao_functions_t audio_out_v4l2;
-extern ao_functions_t audio_out_mpegpes;
-extern ao_functions_t audio_out_pcm;
-extern ao_functions_t audio_out_pss;
+extern const ao_functions_t audio_out_oss;
+extern const ao_functions_t audio_out_macosx;
+extern const ao_functions_t audio_out_arts;
+extern const ao_functions_t audio_out_esd;
+extern const ao_functions_t audio_out_pulse;
+extern const ao_functions_t audio_out_jack;
+extern const ao_functions_t audio_out_openal;
+extern const ao_functions_t audio_out_null;
+extern const ao_functions_t audio_out_alsa5;
+extern const ao_functions_t audio_out_alsa;
+extern const ao_functions_t audio_out_nas;
+extern const ao_functions_t audio_out_sdl;
+extern const ao_functions_t audio_out_sun;
+extern const ao_functions_t audio_out_sgi;
+extern const ao_functions_t audio_out_win32;
+extern const ao_functions_t audio_out_dsound;
+extern const ao_functions_t audio_out_dart;
+extern const ao_functions_t audio_out_dxr2;
+extern const ao_functions_t audio_out_ivtv;
+extern const ao_functions_t audio_out_v4l2;
+extern const ao_functions_t audio_out_mpegpes;
+extern const ao_functions_t audio_out_pcm;
+extern const ao_functions_t audio_out_pss;
const ao_functions_t* const audio_out_drivers[] =
{
diff --git a/libao2/audio_out_internal.h b/libao2/audio_out_internal.h
index e702430cc5..504923b162 100644
--- a/libao2/audio_out_internal.h
+++ b/libao2/audio_out_internal.h
@@ -31,7 +31,7 @@ static float get_delay(void);
static void audio_pause(void);
static void audio_resume(void);
-#define LIBAO_EXTERN(x) ao_functions_t audio_out_##x =\
+#define LIBAO_EXTERN(x) const ao_functions_t audio_out_##x =\
{\
&info,\
control,\