diff options
author | Ben Boeckel <mathstuf@gmail.com> | 2013-09-26 02:21:19 -0400 |
---|---|---|
committer | Ben Boeckel <mathstuf@gmail.com> | 2013-10-07 22:40:40 -0400 |
commit | 4f287f17929e4448688266105caa2c939720d01f (patch) | |
tree | 1f6d3e5603f32932c421145d7cb70aa0b0b855e4 /demux/demux_mkv.c | |
parent | 07fbba3935e9d4327d3ae946b747486693d9d0f7 (diff) | |
download | mpv-4f287f17929e4448688266105caa2c939720d01f.tar.bz2 mpv-4f287f17929e4448688266105caa2c939720d01f.tar.xz |
matroska: parse the requested edition for the segment reference
Diffstat (limited to 'demux/demux_mkv.c')
-rw-r--r-- | demux/demux_mkv.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/demux/demux_mkv.c b/demux/demux_mkv.c index 9ca4e62ecb..8b497a1402 100644 --- a/demux/demux_mkv.c +++ b/demux/demux_mkv.c @@ -850,13 +850,13 @@ static int demux_mkv_read_chapters(struct demuxer *demuxer) if (len != sizeof(chapter.uid.segment)) mp_msg(MSGT_DEMUX, warn_level, "[mkv] Chapter segment uid bad length %d\n", len); - else if (ca->n_chapter_segment_edition_uid) { - mp_tmsg(MSGT_DEMUX, warn_level, "[mkv] Warning: " - "unsupported edition recursion in chapter; " - "will skip on playback!\n"); - } else { + else { memcpy(chapter.uid.segment, ca->chapter_segment_uid.start, len); + if (ca->n_chapter_segment_edition_uid) + chapter.uid.edition = ca->chapter_segment_edition_uid; + else + chapter.uid.edition = 0; mp_msg(MSGT_DEMUX, MSGL_V, "[mkv] Chapter segment uid "); for (int n = 0; n < len; n++) mp_msg(MSGT_DEMUX, MSGL_V, "%02x ", |