From: Aurelien Jacobs Date: Sun, 12 Nov 2006 16:59:27 +0000 (+0000) Subject: Allows playback of truncated matroska files. X-Git-Tag: v0.5~11093 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=7e2447028cc9ba184e2be530288ddd1ee959a852;p=platform%2Fupstream%2Flibav.git Allows playback of truncated matroska files. Originally committed as revision 6989 to svn://svn.ffmpeg.org/ffmpeg/trunk --- diff --git a/libavformat/matroska.c b/libavformat/matroska.c index 758fe65..7eca05b 100644 --- a/libavformat/matroska.c +++ b/libavformat/matroska.c @@ -1942,7 +1942,7 @@ matroska_parse_seekhead (MatroskaDemuxContext *matroska) /* check ID */ if (!(id = ebml_peek_id (matroska, &matroska->level_up))) - break; + goto finish; if (id != seek_id) { av_log(matroska->ctx, AV_LOG_INFO, "We looked for ID=0x%x but got " @@ -1954,7 +1954,7 @@ matroska_parse_seekhead (MatroskaDemuxContext *matroska) /* read master + parse */ if ((res = ebml_read_master(matroska, &id)) < 0) - break; + goto finish; switch (id) { case MATROSKA_ID_CUES: if (!(res = matroska_parse_index(matroska)) || @@ -1971,8 +1971,6 @@ matroska_parse_seekhead (MatroskaDemuxContext *matroska) } break; } - if (res < 0) - break; finish: /* remove dummy level */