Commit 6854127a authored by Andreas Rheinhardt's avatar Andreas Rheinhardt Committed by James Almer

avformat/matroskadec: Reindent after previous commit

Also use the smallest scope possible for a loop variable.
Signed-off-by: 's avatarAndreas Rheinhardt <andreas.rheinhardt@gmail.com>
parent 71c90881
...@@ -1068,36 +1068,36 @@ static EbmlSyntax *ebml_parse_id(EbmlSyntax *syntax, uint32_t id) ...@@ -1068,36 +1068,36 @@ static EbmlSyntax *ebml_parse_id(EbmlSyntax *syntax, uint32_t id)
static int ebml_parse_nest(MatroskaDemuxContext *matroska, EbmlSyntax *syntax, static int ebml_parse_nest(MatroskaDemuxContext *matroska, EbmlSyntax *syntax,
void *data) void *data)
{ {
int i, res; int res;
if (data) { if (data) {
for (i = 0; syntax[i].id; i++) for (int i = 0; syntax[i].id; i++)
switch (syntax[i].type) { switch (syntax[i].type) {
case EBML_UINT: case EBML_UINT:
*(uint64_t *) ((char *) data + syntax[i].data_offset) = syntax[i].def.u; *(uint64_t *) ((char *) data + syntax[i].data_offset) = syntax[i].def.u;
break; break;
case EBML_SINT: case EBML_SINT:
*(int64_t *) ((char *) data + syntax[i].data_offset) = syntax[i].def.i; *(int64_t *) ((char *) data + syntax[i].data_offset) = syntax[i].def.i;
break; break;
case EBML_FLOAT: case EBML_FLOAT:
*(double *) ((char *) data + syntax[i].data_offset) = syntax[i].def.f; *(double *) ((char *) data + syntax[i].data_offset) = syntax[i].def.f;
break; break;
case EBML_STR: case EBML_STR:
case EBML_UTF8: case EBML_UTF8:
// the default may be NULL // the default may be NULL
if (syntax[i].def.s) { if (syntax[i].def.s) {
uint8_t **dst = (uint8_t **) ((uint8_t *) data + syntax[i].data_offset); uint8_t **dst = (uint8_t **) ((uint8_t *) data + syntax[i].data_offset);
*dst = av_strdup(syntax[i].def.s); *dst = av_strdup(syntax[i].def.s);
if (!*dst) if (!*dst)
return AVERROR(ENOMEM); return AVERROR(ENOMEM);
}
break;
} }
break;
}
if (!matroska->levels[matroska->num_levels - 1].length) { if (!matroska->levels[matroska->num_levels - 1].length) {
matroska->num_levels--; matroska->num_levels--;
return 0; return 0;
} }
} }
do { do {
...@@ -1229,18 +1229,18 @@ static int ebml_parse(MatroskaDemuxContext *matroska, ...@@ -1229,18 +1229,18 @@ static int ebml_parse(MatroskaDemuxContext *matroska,
} }
if (data) { if (data) {
data = (char *) data + syntax->data_offset; data = (char *) data + syntax->data_offset;
if (syntax->list_elem_size) { if (syntax->list_elem_size) {
EbmlList *list = data; EbmlList *list = data;
void *newelem = av_realloc_array(list->elem, list->nb_elem + 1, void *newelem = av_realloc_array(list->elem, list->nb_elem + 1,
syntax->list_elem_size); syntax->list_elem_size);
if (!newelem) if (!newelem)
return AVERROR(ENOMEM); return AVERROR(ENOMEM);
list->elem = newelem; list->elem = newelem;
data = (char *) list->elem + list->nb_elem * syntax->list_elem_size; data = (char *) list->elem + list->nb_elem * syntax->list_elem_size;
memset(data, 0, syntax->list_elem_size); memset(data, 0, syntax->list_elem_size);
list->nb_elem++; list->nb_elem++;
} }
} }
if (syntax->type != EBML_STOP) { if (syntax->type != EBML_STOP) {
......
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