summaryrefslogtreecommitdiffstats
path: root/libmpdemux
diff options
context:
space:
mode:
authormosu <mosu@b3059339-0415-0410-9bf9-f77b7e298cf2>2003-08-23 22:51:10 +0000
committermosu <mosu@b3059339-0415-0410-9bf9-f77b7e298cf2>2003-08-23 22:51:10 +0000
commitfb2af6ee84b7d4949058f77705f965cce6b16ce9 (patch)
tree39a9a6e04c2974c0a572177bc2c9003a54bb6b9c /libmpdemux
parentcfa19109e9503f930c0732bbedf062bbfbe25844 (diff)
downloadmpv-fb2af6ee84b7d4949058f77705f965cce6b16ce9.tar.bz2
mpv-fb2af6ee84b7d4949058f77705f965cce6b16ce9.tar.xz
Re-added block duration parsing, needed for subtitles. Got lost in the last update. Patch by Bruno Lecointre.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@10685 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libmpdemux')
-rw-r--r--libmpdemux/demux_mkv.cpp3
1 files changed, 3 insertions, 0 deletions
diff --git a/libmpdemux/demux_mkv.cpp b/libmpdemux/demux_mkv.cpp
index d58573d7d4..6a5cc5327c 100644
--- a/libmpdemux/demux_mkv.cpp
+++ b/libmpdemux/demux_mkv.cpp
@@ -1925,6 +1925,9 @@ extern "C" int demux_mkv_fill_buffer(demuxer_t *d) {
true);
kbdur = FINDFIRST(l2, KaxBlockDuration);
+ if (kbdur != NULL)
+ block_duration = uint64(*kbdur);
+
kblock = FINDFIRST(l2, KaxBlock);
if (kblock != NULL)
kblock->SetParent(*mkv_d->cluster);