diff options
| author | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2010-03-10 00:00:06 +0200 |
|---|---|---|
| committer | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2010-03-10 00:00:06 +0200 |
| commit | c37f09693d0edb632c80f8f38ecdb2faf3547f7f (patch) | |
| tree | 44df07eacb522a97bbecd7a3a0f93e8d6a933003 /libmpdemux/demux_mkv.c | |
| parent | 22a06c4ae5672c1dd629918d0a279b8af24e35c3 (diff) | |
| parent | 2aafb808284d74edab6e5320e1114f5c74d5881e (diff) | |
| download | mpv-c37f09693d0edb632c80f8f38ecdb2faf3547f7f.tar.bz2 mpv-c37f09693d0edb632c80f8f38ecdb2faf3547f7f.tar.xz | |
Merge svn changes up to r30643
Diffstat (limited to 'libmpdemux/demux_mkv.c')
| -rw-r--r-- | libmpdemux/demux_mkv.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/libmpdemux/demux_mkv.c b/libmpdemux/demux_mkv.c index 67e26a0730..24101d516e 100644 --- a/libmpdemux/demux_mkv.c +++ b/libmpdemux/demux_mkv.c @@ -36,6 +36,7 @@ #include "stheader.h" #include "ebml.h" #include "matroska.h" +#include "demux_real.h" #include "mp_msg.h" #include "help_mp.h" @@ -1886,10 +1887,6 @@ static void handle_subtitles(demuxer_t *demuxer, mkv_track_t *track, ds_add_packet(demuxer->sub, dp); } -double real_fix_timestamp(unsigned char *buf, unsigned int timestamp, - unsigned int format, int64_t *kf_base, int *kf_pts, - double *pts); - static void handle_realvideo(demuxer_t *demuxer, mkv_track_t *track, uint8_t *buffer, uint32_t size, int block_bref) { |