diff options
| author | wm4 <wm4@nowhere> | 2013-04-30 00:52:32 +0200 |
|---|---|---|
| committer | wm4 <wm4@nowhere> | 2013-04-30 00:52:32 +0200 |
| commit | ea7b920184a865a3343001318fc4a32dcfc7b4f5 (patch) | |
| tree | fbefd8539b77ee7473ad73740cc8ffa97bc4ffbe /audio/decode/ad_internal.h | |
| parent | 3dcc83a70609d392c8ecd917dd5c16995424e9c4 (diff) | |
| parent | d98e61ea438db66323734ad1b6bea66411a3c97b (diff) | |
| download | mpv-ea7b920184a865a3343001318fc4a32dcfc7b4f5.tar.bz2 mpv-ea7b920184a865a3343001318fc4a32dcfc7b4f5.tar.xz | |
Merge branch 'master' into low_quality_intel_crap
Conflicts:
video/out/gl_video_shaders.glsl
video/out/vo_opengl.c
Diffstat (limited to 'audio/decode/ad_internal.h')
| -rw-r--r-- | audio/decode/ad_internal.h | 2 |
1 files changed, 1 insertions, 1 deletions
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 = {\ |