diff options
| author | Nicolas George <nicolas.george@normalesup.org> | 2012-02-29 13:46:32 +0100 |
|---|---|---|
| committer | Nicolas George <nicolas.george@normalesup.org> | 2012-03-07 16:41:30 +0100 |
| commit | c088b7f389ebeaf1070d63ac9d38ef20bae0c7cb (patch) | |
| tree | b0e619450201e0bcdd85f40fadc148867e6459de | |
| parent | e5dd4ae7284bb290d8dc8e9cd3f2e035d1d77cd0 (diff) | |
| download | ffmpeg-c088b7f389ebeaf1070d63ac9d38ef20bae0c7cb.tar.gz | |
ass_split: accept files with only \n and no \r.
The +1 is there to skip the ','.
With \r\n, the +1 skips the \r but that is ok.
With only \n, the +1 skips it and all hell breaks loose.
| -rw-r--r-- | libavcodec/ass_split.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/ass_split.c b/libavcodec/ass_split.c index 2a3b76445e..a0b72542c7 100644 --- a/libavcodec/ass_split.c +++ b/libavcodec/ass_split.c @@ -232,7 +232,7 @@ static const char *ass_split_section(ASSSplitContext *ctx, const char *buf) break; } (*number)++; - buf = skip_space(buf + len + 1); + buf = skip_space(buf + len + (buf[len] == ',')); } ctx->field_order[ctx->current_section] = order; } else if (section->fields_header) { |