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/dec_audio.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/dec_audio.h')
| -rw-r--r-- | audio/decode/dec_audio.h | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/audio/decode/dec_audio.h b/audio/decode/dec_audio.h index b46f4282fb..3ec5954471 100644 --- a/audio/decode/dec_audio.h +++ b/audio/decode/dec_audio.h @@ -22,15 +22,14 @@ #include "audio/chmap.h" #include "demux/stheader.h" -struct bstr; +struct mp_audio_buffer; struct mp_decoder_list; struct mp_decoder_list *mp_audio_decoder_list(void); int init_best_audio_codec(sh_audio_t *sh_audio, char *audio_decoders); -int decode_audio(sh_audio_t *sh_audio, struct bstr *outbuf, int minlen); -void decode_audio_prepend_bytes(struct bstr *outbuf, int count, int byte); +int decode_audio(sh_audio_t *sh_audio, struct mp_audio_buffer *outbuf, + int minsamples); void resync_audio_stream(sh_audio_t *sh_audio); -void skip_audio_frame(sh_audio_t *sh_audio); void uninit_audio(sh_audio_t *sh_audio); int init_audio_filters(sh_audio_t *sh_audio, int in_samplerate, |