diff options
| author | wm4 <wm4@nowhere> | 2013-11-12 23:42:04 +0100 |
|---|---|---|
| committer | wm4 <wm4@nowhere> | 2013-11-12 23:42:04 +0100 |
| commit | e4bbb1d348dafbb32722f413648006a7bd9d0897 (patch) | |
| tree | 7165ed9f86a77b751187600d0a9de8b35416f380 /audio/decode/ad.h | |
| parent | e4f2fcc0ecd31322df65141edf0ddbff9c075f5d (diff) | |
| parent | 22b3f522cacfbdba76d311c86efd6091512eb089 (diff) | |
| download | mpv-e4bbb1d348dafbb32722f413648006a7bd9d0897.tar.bz2 mpv-e4bbb1d348dafbb32722f413648006a7bd9d0897.tar.xz | |
Merge branch 'planar_audio'
Conflicts:
audio/out/ao_lavc.c
Diffstat (limited to 'audio/decode/ad.h')
| -rw-r--r-- | audio/decode/ad.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/audio/decode/ad.h b/audio/decode/ad.h index 30e739d135..6c76e8dfd0 100644 --- a/audio/decode/ad.h +++ b/audio/decode/ad.h @@ -24,6 +24,7 @@ #include "demux/demux.h" #include "audio/format.h" +#include "audio/audio.h" struct mp_decoder_list; @@ -35,8 +36,7 @@ struct ad_functions { 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 (*decode_audio)(sh_audio_t *sh, unsigned char *buffer, int minlen, - int maxlen); + int (*decode_audio)(sh_audio_t *sh, struct mp_audio *buffer, int maxlen); }; enum ad_ctrl { |