Chiebot-Mirror
/
FFmpeg
mirror of https://github.com/FFmpeg/FFmpeg.git
8
0
Fork 0
Code Issues Projects Releases Wiki Activity

matroskadec: cosmetics: indentation of matroska_execute_seekhead()

Browse Source 
Originally committed as revision 14566 to svn://svn.ffmpeg.org/ffmpeg/trunk
pull/126/head
Aurelien Jacobs 17 years ago
parent 82113343a7
commit 4348571b1a
1 changed files with 57 additions and 57 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 114
      libavformat/matroskadec.c

114
libavformat/matroskadec.c
Unescape View File

@ -1356,69 +1356,69 @@ matroska_execute_seekhead(MatroskaDemuxContext *matroska)
|| seekhead[i].id == MATROSKA_ID_CLUSTER)
continue;
/* seek */
if (ebml_read_seek(matroska,
seekhead[i].pos+matroska->segment_start) < 0)
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;
}
/* seek */
if (ebml_read_seek(matroska,
seekhead[i].pos+matroska->segment_start) < 0)
continue;
level.start = 0;
level.length = (uint64_t)-1;
matroska->levels[matroska->num_levels] = level;
matroska->num_levels++;
/* 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;
}
/* check ID */
if (!(id = ebml_peek_id (matroska,
&matroska->level_up)))
goto finish;
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;
}
level.start = 0;
level.length = (uint64_t)-1;
matroska->levels[matroska->num_levels] = level;
matroska->num_levels++;
/* read master + parse */
switch (id) {
case MATROSKA_ID_CUES:
if (!(res = matroska_parse_index(matroska)) ||
url_feof(matroska->ctx->pb)) {
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;
}
/* check ID */
if (!(id = ebml_peek_id (matroska,
&matroska->level_up)))
goto finish;
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;
}
finish:
/* remove dummy level */
while (matroska->num_levels) {
uint64_t length = matroska->levels[--matroska->num_levels].length;
if (length == (uint64_t)-1)
break;
}
/* read master + parse */
switch (id) {
case MATROSKA_ID_CUES:
if (!(res = matroska_parse_index(matroska)) ||
url_feof(matroska->ctx->pb)) {
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 */
ebml_read_seek(matroska, before_pos);
matroska->peek_id = peek_id_cache;
matroska->level_up = level_up;
/* seek back */
ebml_read_seek(matroska, before_pos);
matroska->peek_id = peek_id_cache;
matroska->level_up = level_up;
}
static int

Write Preview
Loading…
Cancel
Save