summaryrefslogtreecommitdiff
path: root/libavformat
diff options
context:
space:
mode:
authorAurelien Jacobs <aurel@gnuage.org>2008-08-05 00:40:43 +0000
committerAurelien Jacobs <aurel@gnuage.org>2008-08-05 00:40:43 +0000
commit4348571b1ac4ec616363d62ea5615b34d77ad0bc (patch)
tree1f0dbb4480e391b48223598f22f31eed0167bdb3 /libavformat
parent82113343a7745a59e78361f92a78ac651880542e (diff)
matroskadec: cosmetics: indentation of matroska_execute_seekhead()
Originally committed as revision 14566 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavformat')
-rw-r--r--libavformat/matroskadec.c114
1 files changed, 57 insertions, 57 deletions
diff --git a/libavformat/matroskadec.c b/libavformat/matroskadec.c
index 5da156e71a..6b1ff97d50 100644
--- a/libavformat/matroskadec.c
+++ b/libavformat/matroskadec.c
@@ -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