virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-10 06:10:52 +02:00
Code Issues Releases Activity

lavfi/vf_ass: ignore subtitles decoding errors.

Browse Source 
A broken packet with invalid data in the middle of the stream
should not prevent from decoding the rest of the file.

Work around trac ticket #2264.
This commit is contained in:
Nicolas George
2013-02-13 10:26:42 +01:00
parent 7d0e3b197c
commit bb3303b94c
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
libavfilter/vf_ass.c
View File

@@ -318,8 +318,11 @@ static av_cold int init_subtitles(AVFilterContext *ctx, const char *args)
if (pkt.stream_index == sid) { if (pkt.stream_index == sid) {
ret = avcodec_decode_subtitle2(dec_ctx, &sub, &got_subtitle, &pkt); ret = avcodec_decode_subtitle2(dec_ctx, &sub, &got_subtitle, &pkt);
if (ret < 0 || !got_subtitle) if (ret < 0) {
break; av_log(ctx, AV_LOG_WARNING, "Error decoding: %s (ignored)\n",
av_err2str(ret));
} else if (got_subtitle) {
/* TODO reindent */
for (i = 0; i < sub.num_rects; i++) { for (i = 0; i < sub.num_rects; i++) {
char *ass_line = sub.rects[i]->ass; char *ass_line = sub.rects[i]->ass;
if (!ass_line) if (!ass_line)
@@ -327,6 +330,7 @@ static av_cold int init_subtitles(AVFilterContext *ctx, const char *args)
ass_process_data(ass->track, ass_line, strlen(ass_line)); ass_process_data(ass->track, ass_line, strlen(ass_line));
} }
} }
}
av_free_packet(&pkt); av_free_packet(&pkt);
avsubtitle_free(&sub); avsubtitle_free(&sub);
} }