[SCM] libav/experimental: Allows playback of truncated matroska files.
siretart at users.alioth.debian.org
siretart at users.alioth.debian.org
Sun Jun 30 15:53:15 UTC 2013
The following commit has been merged in the experimental branch:
commit 7e2447028cc9ba184e2be530288ddd1ee959a852
Author: Aurelien Jacobs <aurel at gnuage.org>
Date: Sun Nov 12 16:59:27 2006 +0000
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 */
--
Libav/FFmpeg packaging
More information about the pkg-multimedia-commits
mailing list