summaryrefslogtreecommitdiffstats
path: root/demux/demux.h
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2013-06-03 01:28:14 +0200
committerwm4 <wm4@nowhere>2013-06-03 22:40:07 +0200
commit13a1ce16f9581871cf7ac0d06ece407534a98f89 (patch)
treed6fd8ec1b24476af2473fc6bde57590ea6dfe6d6 /demux/demux.h
parent5d517184f5c294e6aba8e2d729fad7caa5db75b4 (diff)
downloadmpv-13a1ce16f9581871cf7ac0d06ece407534a98f89.tar.bz2
mpv-13a1ce16f9581871cf7ac0d06ece407534a98f89.tar.xz
sub: pass subtitle packets directly
Before this, subtitle packets were returned as data ptr/len pairs, and mplayer.c got the rest (pts and duration) directly from the demuxer data structures. Then mplayer.c reassembled the packet data structure again. Pass packets directly instead. The mplayer.c side stays a bit awkward, because the (now by default unused) DVD path keeps getting in the way. In demux.c there's lots of weird stuff (3 functions that read packets, really?), but we want to keep the code equivalent for now to avoid hitting weird issues and corner cases.
Diffstat (limited to 'demux/demux.h')
-rw-r--r--demux/demux.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/demux/demux.h b/demux/demux.h
index e58c56141f..9ec6d0c6f0 100644
--- a/demux/demux.h
+++ b/demux/demux.h
@@ -344,7 +344,7 @@ void ds_free_packs(struct demux_stream *ds);
int ds_get_packet(struct demux_stream *ds, unsigned char **start);
int ds_get_packet_pts(struct demux_stream *ds, unsigned char **start,
double *pts);
-int ds_get_packet_sub(struct demux_stream *ds, unsigned char **start);
+struct demux_packet *ds_get_packet_sub(demux_stream_t *ds);
struct demux_packet *ds_get_packet2(struct demux_stream *ds, bool repeat_last);
double ds_get_next_pts(struct demux_stream *ds);
int ds_parse(struct demux_stream *sh, uint8_t **buffer, int *len, double pts,