generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

avcodec/ass_split: assume default order when "Format:" line is not found

Browse Source 
Fixes the decoding of the ASS stream in a mkv from a fansub release from
Coalgirls.
This commit is contained in:
Clément Bœsch 2014-10-11 16:12:51 +02:00
parent d9f272fe33
commit 3e86ead383
1 changed files with 25 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
libavcodec/ass_split.c
View File

@ -229,6 +229,20 @@ static inline const char *skip_space(const char *buf)
return buf; return buf;
} }
static int *get_default_field_orders(const ASSSection *section)
{
int i;
int *order = av_malloc(FF_ARRAY_ELEMS(section->fields) * sizeof(*order));
if (!order)
return NULL;
for (i = 0; section->fields[i].name; i++)
order[i] = i;
while (i < FF_ARRAY_ELEMS(section->fields))
order[i] = -1;
return order;
}
static const char *ass_split_section(ASSSplitContext *ctx, const char *buf) static const char *ass_split_section(ASSSplitContext *ctx, const char *buf)
{ {
const ASSSection *section = &ass_sections[ctx->current_section]; const ASSSection *section = &ass_sections[ctx->current_section];
@ -246,7 +260,7 @@ static const char *ass_split_section(ASSSplitContext *ctx, const char *buf)
} else if (section->format_header && !order) { } else if (section->format_header && !order) {
len = strlen(section->format_header); len = strlen(section->format_header);
if (strncmp(buf, section->format_header, len) || buf[len] != ':') if (strncmp(buf, section->format_header, len) || buf[len] != ':')
return NULL; goto next_line;
buf += len + 1; buf += len + 1;
while (!is_eol(*buf)) { while (!is_eol(*buf)) {
buf = skip_space(buf); buf = skip_space(buf);
@ -269,6 +283,15 @@ static const char *ass_split_section(ASSSplitContext *ctx, const char *buf)
if (!strncmp(buf, section->fields_header, len) && buf[len] == ':') { if (!strncmp(buf, section->fields_header, len) && buf[len] == ':') {
uint8_t *ptr, *struct_ptr = realloc_section_array(ctx); uint8_t *ptr, *struct_ptr = realloc_section_array(ctx);
if (!struct_ptr) return NULL; if (!struct_ptr) return NULL;
/* No format header line found so far, assume default */
if (!order) {
order = get_default_field_orders(section);
if (!order)
return NULL;
ctx->field_order[ctx->current_section] = order;
}
buf += len + 1; buf += len + 1;
for (i=0; !is_eol(*buf) && i < *number; i++) { for (i=0; !is_eol(*buf) && i < *number; i++) {
int last = i == *number - 1; int last = i == *number - 1;
@ -298,6 +321,7 @@ static const char *ass_split_section(ASSSplitContext *ctx, const char *buf)
} }
} }
} }
next_line:
buf += strcspn(buf, "\n"); buf += strcspn(buf, "\n");
buf += !!*buf; buf += !!*buf;
} }