highperfocused/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

lavfi/ass: use ass_process_chunk() instead of ass_process_data()

Browse Source
This commit is contained in:
Clément Bœsch 2016-02-21 12:41:49 +01:00
parent 6433618dc0
commit fa2df3a401
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
libavfilter/vf_subtitles.c
View File

@ -393,6 +393,8 @@ static av_cold int init_subtitles(AVFilterContext *ctx)
} }
if (ass->charenc) if (ass->charenc)
av_dict_set(&codec_opts, "sub_charenc", ass->charenc, 0); av_dict_set(&codec_opts, "sub_charenc", ass->charenc, 0);
if (LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(57,25,100))
av_dict_set(&codec_opts, "sub_text_format", "ass", 0);
ret = avcodec_open2(dec_ctx, dec, &codec_opts); ret = avcodec_open2(dec_ctx, dec, &codec_opts);
if (ret < 0) if (ret < 0)
goto end; goto end;
@ -436,11 +438,17 @@ static av_cold int init_subtitles(AVFilterContext *ctx)
av_log(ctx, AV_LOG_WARNING, "Error decoding: %s (ignored)\n", av_log(ctx, AV_LOG_WARNING, "Error decoding: %s (ignored)\n",
av_err2str(ret)); av_err2str(ret));
} else if (got_subtitle) { } else if (got_subtitle) {
const int64_t start_time = av_rescale_q(sub.pts, AV_TIME_BASE_Q, av_make_q(1, 1000));
const int64_t duration = sub.end_display_time;
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)
break; break;
ass_process_data(ass->track, ass_line, strlen(ass_line)); if (LIBAVCODEC_VERSION_INT < AV_VERSION_INT(57,25,100))
ass_process_data(ass->track, ass_line, strlen(ass_line));
else
ass_process_chunk(ass->track, ass_line, strlen(ass_line),
start_time, duration);
} }
} }
} }