summaryrefslogtreecommitdiffstats
path: root/libao2
diff options
context:
space:
mode:
authorhenry <henry@b3059339-0415-0410-9bf9-f77b7e298cf2>2002-11-02 10:59:27 +0000
committerhenry <henry@b3059339-0415-0410-9bf9-f77b7e298cf2>2002-11-02 10:59:27 +0000
commitcb3ab03342274b9e1f7347f0ed11c0b68f90946d (patch)
tree42b2cd57cd6b0051eb5aedd410d71d6a8f9a2569 /libao2
parent658d3e3d64b5d3bc326ac5e3146609822655cdea (diff)
downloadmpv-cb3ab03342274b9e1f7347f0ed11c0b68f90946d.tar.bz2
mpv-cb3ab03342274b9e1f7347f0ed11c0b68f90946d.tar.xz
warning fixes
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@8037 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libao2')
-rw-r--r--libao2/ao_alsa1x.c5
-rw-r--r--libao2/ao_alsa9.c5
2 files changed, 8 insertions, 2 deletions
diff --git a/libao2/ao_alsa1x.c b/libao2/ao_alsa1x.c
index 0d53ea7262..92ffb033b5 100644
--- a/libao2/ao_alsa1x.c
+++ b/libao2/ao_alsa1x.c
@@ -48,7 +48,7 @@ static snd_pcm_t *alsa_handler;
static snd_pcm_format_t alsa_format;
static snd_pcm_hw_params_t *alsa_hwparams;
static snd_pcm_sw_params_t *alsa_swparams;
-const char *alsa_device;
+static char *alsa_device;
/* possible 4096, original 8192
* was only needed for calculating chunksize? */
@@ -827,6 +827,9 @@ static int xrun(u_char *str_mode)
return(1); /* ok, data should be accepted again */
}
+static int play_normal(void* data, int len);
+static int play_mmap(void* data, int len);
+
static int play(void* data, int len, int flags)
{
int result;
diff --git a/libao2/ao_alsa9.c b/libao2/ao_alsa9.c
index 0d53ea7262..92ffb033b5 100644
--- a/libao2/ao_alsa9.c
+++ b/libao2/ao_alsa9.c
@@ -48,7 +48,7 @@ static snd_pcm_t *alsa_handler;
static snd_pcm_format_t alsa_format;
static snd_pcm_hw_params_t *alsa_hwparams;
static snd_pcm_sw_params_t *alsa_swparams;
-const char *alsa_device;
+static char *alsa_device;
/* possible 4096, original 8192
* was only needed for calculating chunksize? */
@@ -827,6 +827,9 @@ static int xrun(u_char *str_mode)
return(1); /* ok, data should be accepted again */
}
+static int play_normal(void* data, int len);
+static int play_mmap(void* data, int len);
+
static int play(void* data, int len, int flags)
{
int result;