Commit 4348571b authored by Aurelien Jacobs's avatar Aurelien Jacobs

matroskadec: cosmetics: indentation of matroska_execute_seekhead()

Originally committed as revision 14566 to svn://svn.ffmpeg.org/ffmpeg/trunk
parent 82113343
...@@ -1356,69 +1356,69 @@ matroska_execute_seekhead(MatroskaDemuxContext *matroska) ...@@ -1356,69 +1356,69 @@ matroska_execute_seekhead(MatroskaDemuxContext *matroska)
|| seekhead[i].id == MATROSKA_ID_CLUSTER) || seekhead[i].id == MATROSKA_ID_CLUSTER)
continue; continue;
/* seek */ /* seek */
if (ebml_read_seek(matroska, if (ebml_read_seek(matroska,
seekhead[i].pos+matroska->segment_start) < 0) seekhead[i].pos+matroska->segment_start) < 0)
continue; continue;
/* we don't want to lose our seekhead level, so we add
* a dummy. This is a crude hack. */
if (matroska->num_levels == EBML_MAX_DEPTH) {
av_log(matroska->ctx, AV_LOG_INFO,
"Max EBML element depth (%d) reached, "
"cannot parse further.\n", EBML_MAX_DEPTH);
break;
}
level.start = 0; /* we don't want to lose our seekhead level, so we add
level.length = (uint64_t)-1; * a dummy. This is a crude hack. */
matroska->levels[matroska->num_levels] = level; if (matroska->num_levels == EBML_MAX_DEPTH) {
matroska->num_levels++; av_log(matroska->ctx, AV_LOG_INFO,
"Max EBML element depth (%d) reached, "
"cannot parse further.\n", EBML_MAX_DEPTH);
break;
}
/* check ID */ level.start = 0;
if (!(id = ebml_peek_id (matroska, level.length = (uint64_t)-1;
&matroska->level_up))) matroska->levels[matroska->num_levels] = level;
goto finish; matroska->num_levels++;
if (id != seekhead[i].id) {
av_log(matroska->ctx, AV_LOG_INFO,
"We looked for ID=0x%x but got "
"ID=0x%x (pos=%"PRIu64")",
(int)seekhead[i].id, id, seekhead[i].pos +
matroska->segment_start);
goto finish;
}
/* read master + parse */ /* check ID */
switch (id) { if (!(id = ebml_peek_id (matroska,
case MATROSKA_ID_CUES: &matroska->level_up)))
if (!(res = matroska_parse_index(matroska)) || goto finish;
url_feof(matroska->ctx->pb)) { if (id != seekhead[i].id) {
matroska->index_parsed = 1; av_log(matroska->ctx, AV_LOG_INFO,
res = 0; "We looked for ID=0x%x but got "
} "ID=0x%x (pos=%"PRIu64")",
break; (int)seekhead[i].id, id, seekhead[i].pos +
case MATROSKA_ID_TAGS: matroska->segment_start);
if (!(res = matroska_parse_metadata(matroska)) || goto finish;
url_feof(matroska->ctx->pb)) { }
matroska->metadata_parsed = 1;
res = 0;
}
break;
}
finish: /* read master + parse */
/* remove dummy level */ switch (id) {
while (matroska->num_levels) { case MATROSKA_ID_CUES:
uint64_t length = matroska->levels[--matroska->num_levels].length; if (!(res = matroska_parse_index(matroska)) ||
if (length == (uint64_t)-1) url_feof(matroska->ctx->pb)) {
break; matroska->index_parsed = 1;
} res = 0;
}
break;
case MATROSKA_ID_TAGS:
if (!(res = matroska_parse_metadata(matroska)) ||
url_feof(matroska->ctx->pb)) {
matroska->metadata_parsed = 1;
res = 0;
}
break;
}
finish:
/* remove dummy level */
while (matroska->num_levels) {
uint64_t length = matroska->levels[--matroska->num_levels].length;
if (length == (uint64_t)-1)
break;
}
} }
/* seek back */ /* seek back */
ebml_read_seek(matroska, before_pos); ebml_read_seek(matroska, before_pos);
matroska->peek_id = peek_id_cache; matroska->peek_id = peek_id_cache;
matroska->level_up = level_up; matroska->level_up = level_up;
} }
static int static int
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment