diff options
| author | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2009-12-30 00:53:08 +0200 |
|---|---|---|
| committer | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2009-12-30 00:56:10 +0200 |
| commit | d46b86bc7c39082b26ec71aa16431f3275d836ff (patch) | |
| tree | 035da87ed658f7d75c0eba5a5d4de5462a4c8ddd /libmpdemux/demuxer.h | |
| parent | a06b32b64e91082c11f747e2910f10a4afd3dfa9 (diff) | |
| parent | 3e8f2815c19703f5cb6f75db2910234d499d9676 (diff) | |
| download | mpv-d46b86bc7c39082b26ec71aa16431f3275d836ff.tar.bz2 mpv-d46b86bc7c39082b26ec71aa16431f3275d836ff.tar.xz | |
Merge svn changes up to r30136
Ignore another broken correct-pts change in 30134.
Diffstat (limited to 'libmpdemux/demuxer.h')
| -rw-r--r-- | libmpdemux/demuxer.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/libmpdemux/demuxer.h b/libmpdemux/demuxer.h index 44cd642ed3..5da35efa03 100644 --- a/libmpdemux/demuxer.h +++ b/libmpdemux/demuxer.h @@ -400,6 +400,7 @@ int ds_get_packet(demux_stream_t *ds,unsigned char **start); int ds_get_packet_pts(demux_stream_t *ds, unsigned char **start, double *pts); int ds_get_packet_sub(demux_stream_t *ds,unsigned char **start); double ds_get_next_pts(demux_stream_t *ds); +int ds_parse(demux_stream_t *sh, uint8_t **buffer, int *len, double pts, off_t pos); // This is defined here because demux_stream_t ins't defined in stream.h stream_t* new_ds_stream(demux_stream_t *ds); |