path: root/audio
diff options
authorwm4 <wm4@nowhere>2013-04-12 20:32:10 +0200
committerwm4 <wm4@nowhere>2013-04-12 20:35:59 +0200
commit3097176ff1b43991ae78990bb06e8c21981e4170 (patch)
treeb6fb0b200f52e5936009bc2663bae99346d89250 /audio
parentad3dfa145bd7657fc3bfe884ab7250a51688a1f4 (diff)
audio/decode: remove vararg from ad_control()
This was unused and dumb. Ancient MPlayer used varargs instead of void* arguments for control() functions, and this was the last leftover.
Diffstat (limited to 'audio')
5 files changed, 5 insertions, 5 deletions
diff --git a/audio/decode/ad.h b/audio/decode/ad.h
index 3bc3e39267..0bbc11ed9b 100644
--- a/audio/decode/ad.h
+++ b/audio/decode/ad.h
@@ -34,7 +34,7 @@ typedef struct ad_functions
int (*preinit)(sh_audio_t *sh);
int (*init)(sh_audio_t *sh, const char *decoder);
void (*uninit)(sh_audio_t *sh);
- int (*control)(sh_audio_t *sh,int cmd,void* arg, ...);
+ int (*control)(sh_audio_t *sh, int cmd, void *arg);
int (*decode_audio)(sh_audio_t *sh, unsigned char *buffer, int minlen,
int maxlen);
} ad_functions_t;
diff --git a/audio/decode/ad_internal.h b/audio/decode/ad_internal.h
index 7eca629fca..61bf306a5e 100644
--- a/audio/decode/ad_internal.h
+++ b/audio/decode/ad_internal.h
@@ -32,7 +32,7 @@ static void add_decoders(struct mp_decoder_list *list);
static int init(sh_audio_t *sh, const char *decoder);
static int preinit(sh_audio_t *sh);
static void uninit(sh_audio_t *sh);
-static int control(sh_audio_t *sh,int cmd,void* arg, ...);
+static int control(sh_audio_t *sh, int cmd, void *arg);
static int decode_audio(sh_audio_t *sh,unsigned char *buffer,int minlen,int maxlen);
#define LIBAD_EXTERN(x) const ad_functions_t mpcodecs_ad_##x = {\
diff --git a/audio/decode/ad_lavc.c b/audio/decode/ad_lavc.c
index 382d4eacc5..248df307d7 100644
--- a/audio/decode/ad_lavc.c
+++ b/audio/decode/ad_lavc.c
@@ -310,7 +310,7 @@ static void uninit(sh_audio_t *sh)
sh->context = NULL;
-static int control(sh_audio_t *sh, int cmd, void *arg, ...)
+static int control(sh_audio_t *sh, int cmd, void *arg)
struct priv *ctx = sh->context;
switch (cmd) {
diff --git a/audio/decode/ad_mpg123.c b/audio/decode/ad_mpg123.c
index 999dc2fbba..c17edc9197 100644
--- a/audio/decode/ad_mpg123.c
+++ b/audio/decode/ad_mpg123.c
@@ -455,7 +455,7 @@ static int decode_audio(sh_audio_t *sh, unsigned char *buf, int minlen,
return bytes;
-static int control(sh_audio_t *sh, int cmd, void *arg, ...)
+static int control(sh_audio_t *sh, int cmd, void *arg)
switch (cmd) {
diff --git a/audio/decode/ad_spdif.c b/audio/decode/ad_spdif.c
index ad735dde7d..2101721430 100644
--- a/audio/decode/ad_spdif.c
+++ b/audio/decode/ad_spdif.c
@@ -270,7 +270,7 @@ static int decode_audio(sh_audio_t *sh, unsigned char *buf,
return spdif_ctx->out_buffer_len;
-static int control(sh_audio_t *sh, int cmd, void* arg, ...)
+static int control(sh_audio_t *sh, int cmd, void *arg)
unsigned char *start;
double pts;