diff options
| author | wm4 <wm4@nowhere> | 2013-05-12 21:47:55 +0200 |
|---|---|---|
| committer | wm4 <wm4@nowhere> | 2013-05-12 21:47:55 +0200 |
| commit | e6e5a7b221ef2fcdd5a1982d6fdcb627100447d2 (patch) | |
| tree | 08b54ef9bb771434fc7fbe9185793503d3ba314c /audio/out/audio_out_internal.h | |
| parent | 6a83ef1552de4a1a71da49e45647ce1a4ce64e53 (diff) | |
| parent | 48f94311516dc1426644b3e68b2a48c22727e1e7 (diff) | |
| download | mpv-e6e5a7b221ef2fcdd5a1982d6fdcb627100447d2.tar.bz2 mpv-e6e5a7b221ef2fcdd5a1982d6fdcb627100447d2.tar.xz | |
Merge branch 'audio_changes'
Conflicts:
audio/out/ao_lavc.c
Diffstat (limited to 'audio/out/audio_out_internal.h')
| -rw-r--r-- | audio/out/audio_out_internal.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/audio/out/audio_out_internal.h b/audio/out/audio_out_internal.h index f3e92dff66..7b863cfd21 100644 --- a/audio/out/audio_out_internal.h +++ b/audio/out/audio_out_internal.h @@ -20,11 +20,12 @@ #define MPLAYER_AUDIO_OUT_INTERNAL_H #include "core/options.h" +#include "ao.h" // prototypes: //static ao_info_t info; static int control(int cmd, void *arg); -static int init(int rate,int channels,int format,int flags); +static int init(int rate,const struct mp_chmap *channels,int format,int flags); static void uninit(int immed); static void reset(void); static int get_space(void); |