summaryrefslogtreecommitdiffstats
path: root/demux
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2017-08-08 15:19:50 +0200
committerwm4 <wm4@nowhere>2017-08-08 15:19:50 +0200
commit0e36b77aae1ac2af68a45db07d4ff09d9f6dcb30 (patch)
tree17391e715976200137aa3517c99d0d14f60b1379 /demux
parent2ad79785cc4ab9a233acede8880a56ca53613de9 (diff)
downloadmpv-0e36b77aae1ac2af68a45db07d4ff09d9f6dcb30.tar.bz2
mpv-0e36b77aae1ac2af68a45db07d4ff09d9f6dcb30.tar.xz
demux_mkv: avoid an error message in a corner case
If --demuxer-mkv-probe-start-time=no is used, and a seek is triggered on start, then cluster_start will be 0, and the packet reading code will print an error message about not finding valid data. This fixes itself since it invokes the resync code, but it's still pretty ugly. Avoid this by always initializing cluster_start.
Diffstat (limited to 'demux')
-rw-r--r--demux/demux_mkv.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/demux/demux_mkv.c b/demux/demux_mkv.c
index c3ffdac6b2..9f670e2aa5 100644
--- a/demux/demux_mkv.c
+++ b/demux/demux_mkv.c
@@ -1965,6 +1965,7 @@ static int demux_mkv_open(demuxer_t *demuxer, enum demux_check check)
}
if (id == MATROSKA_ID_CLUSTER) {
MP_VERBOSE(demuxer, "|+ found cluster\n");
+ mkv_d->cluster_start = start_pos;
break;
}
int res = read_header_element(demuxer, id, start_pos);