From 112d9aeda1f059f22cd4cf0cbb2f489a74ecd9eb Mon Sep 17 00:00:00 2001 From: wm4 Date: Mon, 9 Mar 2015 22:33:53 +0100 Subject: demux_mkv: never warn when trying to resync on EOF If this happens, the file is actually broken, but the assumption is simply that the file was truncated, and printing a warning would be strange. --- demux/ebml.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'demux/ebml.c') diff --git a/demux/ebml.c b/demux/ebml.c index 99d8970174..52e0f75888 100644 --- a/demux/ebml.c +++ b/demux/ebml.c @@ -228,8 +228,10 @@ int ebml_resync_cluster(struct mp_log *log, stream_t *s) { int64_t pos = stream_tell(s); uint32_t last_4_bytes = 0; - mp_err(log, "Corrupt file detected. " - "Trying to resync starting from position %"PRId64"...\n", pos); + if (!s->eof) { + mp_err(log, "Corrupt file detected. " + "Trying to resync starting from position %"PRId64"...\n", pos); + } while (!s->eof) { // Assumes MATROSKA_ID_CLUSTER is 4 bytes, with no 0 bytes. if (last_4_bytes == MATROSKA_ID_CLUSTER) { -- cgit v1.2.3