diff options
| author | Clément Bœsch <u@pkh.me> | 2016-02-21 12:58:36 +0100 |
|---|---|---|
| committer | Clément Bœsch <u@pkh.me> | 2016-02-26 21:53:34 +0100 |
| commit | 22ebbda637257a432c99330ca4c6024665418f0e (patch) | |
| tree | 149ca54d92cc1915326106f1fc8cb1ae04a922c1 /libavcodec/movtextenc.c | |
| parent | fa2df3a40124bf1d0dc11999f5a578d40a29d553 (diff) | |
lavc: deprecate decoded ass subtitles with timings
Diffstat (limited to 'libavcodec/movtextenc.c')
| -rw-r--r-- | libavcodec/movtextenc.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/libavcodec/movtextenc.c b/libavcodec/movtextenc.c index fcd66138dc..791132ae1a 100644 --- a/libavcodec/movtextenc.c +++ b/libavcodec/movtextenc.c @@ -324,7 +324,7 @@ static int mov_text_encode_frame(AVCodecContext *avctx, unsigned char *buf, { MovTextContext *s = avctx->priv_data; ASSDialog *dialog; - int i, num, length; + int i, length; size_t j; s->text_pos = 0; @@ -339,19 +339,24 @@ static int mov_text_encode_frame(AVCodecContext *avctx, unsigned char *buf, return AVERROR(ENOSYS); } +#if FF_API_ASS_TIMING if (!strncmp(ass, "Dialogue: ", 10)) { + int num; dialog = ff_ass_split_dialog(s->ass_ctx, ass, 0, &num); // TODO reindent for (; dialog && num--; dialog++) { ff_ass_split_override_codes(&mov_text_callbacks, s, dialog->text); } } else { +#endif dialog = ff_ass_split_dialog2(s->ass_ctx, ass); if (!dialog) return AVERROR(ENOMEM); ff_ass_split_override_codes(&mov_text_callbacks, s, dialog->text); ff_ass_free_dialog(&dialog); +#if FF_API_ASS_TIMING } +#endif for (j = 0; j < box_count; j++) { box_types[j].encode(s, box_types[j].type); |