Message ID | 20160910053113.99251-2-rodger.combs@gmail.com |
---|---|
State | Accepted |
Commit | dca03ec5f4d5ca28efc8a80c591412fab5821d81 |
Headers | show |
On Sat, Sep 10, 2016 at 12:31:13AM -0500, Rodger Combs wrote: > --- > libavcodec/ass_split.c | 34 +++++++++++++++++----------------- > 1 file changed, 17 insertions(+), 17 deletions(-) > > diff --git a/libavcodec/ass_split.c b/libavcodec/ass_split.c > index cdb1aa2..d3e8a8d 100644 > --- a/libavcodec/ass_split.c > +++ b/libavcodec/ass_split.c > @@ -276,23 +276,23 @@ static const char *ass_split_section(ASSSplitContext *ctx, const char *buf) > if (section->format_header && !order) { > len = strlen(section->format_header); > if (buf[len] == ':' && !strncmp(buf, section->format_header, len)) { > - buf += len + 1; > - while (!is_eol(*buf)) { > - buf = skip_space(buf); > - len = strcspn(buf, ", \r\n"); > - if (!(tmp = av_realloc_array(order, (*number + 1), sizeof(*order)))) > - return NULL; > - order = tmp; > - order[*number] = -1; > - for (i=0; section->fields[i].name; i++) > - if (!strncmp(buf, section->fields[i].name, len)) { > - order[*number] = i; > - break; > - } > - (*number)++; > - buf = skip_space(buf + len + (buf[len] == ',')); > - } > - ctx->field_order[ctx->current_section] = order; > + buf += len + 1; > + while (!is_eol(*buf)) { > + buf = skip_space(buf); > + len = strcspn(buf, ", \r\n"); > + if (!(tmp = av_realloc_array(order, (*number + 1), sizeof(*order)))) > + return NULL; > + order = tmp; > + order[*number] = -1; > + for (i=0; section->fields[i].name; i++) > + if (!strncmp(buf, section->fields[i].name, len)) { > + order[*number] = i; > + break; > + } > + (*number)++; > + buf = skip_space(buf + len + (buf[len] == ',')); > + } > + ctx->field_order[ctx->current_section] = order; > goto next_line; > } > } sure
diff --git a/libavcodec/ass_split.c b/libavcodec/ass_split.c index cdb1aa2..d3e8a8d 100644 --- a/libavcodec/ass_split.c +++ b/libavcodec/ass_split.c @@ -276,23 +276,23 @@ static const char *ass_split_section(ASSSplitContext *ctx, const char *buf) if (section->format_header && !order) { len = strlen(section->format_header); if (buf[len] == ':' && !strncmp(buf, section->format_header, len)) { - buf += len + 1; - while (!is_eol(*buf)) { - buf = skip_space(buf); - len = strcspn(buf, ", \r\n"); - if (!(tmp = av_realloc_array(order, (*number + 1), sizeof(*order)))) - return NULL; - order = tmp; - order[*number] = -1; - for (i=0; section->fields[i].name; i++) - if (!strncmp(buf, section->fields[i].name, len)) { - order[*number] = i; - break; - } - (*number)++; - buf = skip_space(buf + len + (buf[len] == ',')); - } - ctx->field_order[ctx->current_section] = order; + buf += len + 1; + while (!is_eol(*buf)) { + buf = skip_space(buf); + len = strcspn(buf, ", \r\n"); + if (!(tmp = av_realloc_array(order, (*number + 1), sizeof(*order)))) + return NULL; + order = tmp; + order[*number] = -1; + for (i=0; section->fields[i].name; i++) + if (!strncmp(buf, section->fields[i].name, len)) { + order[*number] = i; + break; + } + (*number)++; + buf = skip_space(buf + len + (buf[len] == ',')); + } + ctx->field_order[ctx->current_section] = order; goto next_line; } }