diff options
| author | Martin Herkt <lachs0r@srsfckn.biz> | 2017-02-12 01:01:56 +0100 |
|---|---|---|
| committer | Martin Herkt <lachs0r@srsfckn.biz> | 2017-02-12 01:01:56 +0100 |
| commit | 35aa705c3ece8293652ffcf449c71fe80b96e722 (patch) | |
| tree | 7c0fb34ec96204cbcd867a973b2476689919a5b4 /audio/decode/ad.h | |
| parent | 10a005df0c981050afc35184a42173bea7ea2527 (diff) | |
| parent | 3739d1318fdb658bb6037bfe06bb6cefb3b50a09 (diff) | |
| download | mpv-35aa705c3ece8293652ffcf449c71fe80b96e722.tar.bz2 mpv-35aa705c3ece8293652ffcf449c71fe80b96e722.tar.xz | |
Merge branch 'master' into release/current
Diffstat (limited to 'audio/decode/ad.h')
| -rw-r--r-- | audio/decode/ad.h | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/audio/decode/ad.h b/audio/decode/ad.h index 771ceb7e88..bbb050eb4c 100644 --- a/audio/decode/ad.h +++ b/audio/decode/ad.h @@ -35,8 +35,11 @@ struct ad_functions { int (*init)(struct dec_audio *da, const char *decoder); void (*uninit)(struct dec_audio *da); int (*control)(struct dec_audio *da, int cmd, void *arg); - int (*decode_packet)(struct dec_audio *da, struct demux_packet *pkt, - struct mp_audio **out); + // Return whether or not the packet has been consumed. + bool (*send_packet)(struct dec_audio *da, struct demux_packet *pkt); + // Return whether decoding is still going on (false if EOF was reached). + // Never returns false & *out set, but can return true with !*out. + bool (*receive_frame)(struct dec_audio *da, struct mp_audio **out); }; enum ad_ctrl { |