diff options
| author | Clément Bœsch <u@pkh.me> | 2014-09-14 20:55:36 +0200 |
|---|---|---|
| committer | Clément Bœsch <u@pkh.me> | 2016-02-26 21:34:33 +0100 |
| commit | 805685fffd3115d3f9260d8df15ef36b6b3b8006 (patch) | |
| tree | 7cc84eafd4c6c87b858bc163d27f04f8795bdfd7 /libavcodec/assenc.c | |
| parent | 7a8ab57cf1fcf32670c932ddbdbf9fa5490d5fa1 (diff) | |
| download | ffmpeg-805685fffd3115d3f9260d8df15ef36b6b3b8006.tar.gz | |
Kill timed SSA
Diffstat (limited to 'libavcodec/assenc.c')
| -rw-r--r-- | libavcodec/assenc.c | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/libavcodec/assenc.c b/libavcodec/assenc.c index 5dc3b09d65..06aa9166ba 100644 --- a/libavcodec/assenc.c +++ b/libavcodec/assenc.c @@ -22,7 +22,6 @@ #include <string.h> #include "avcodec.h" -#include "ass_split.h" #include "ass.h" #include "libavutil/avstring.h" #include "libavutil/internal.h" @@ -53,6 +52,8 @@ static int ass_encode_frame(AVCodecContext *avctx, for (i=0; i<sub->num_rects; i++) { char ass_line[2048]; const char *ass = sub->rects[i]->ass; + long int layer; + char *p; if (sub->rects[i]->type != SUBTITLE_ASS) { av_log(avctx, AV_LOG_ERROR, "Only SUBTITLE_ASS type supported.\n"); @@ -65,10 +66,7 @@ static int ass_encode_frame(AVCodecContext *avctx, return AVERROR_INVALIDDATA; } - if (avctx->codec->id == AV_CODEC_ID_ASS) { - long int layer; - char *p; - + // TODO: reindent if (i > 0) { av_log(avctx, AV_LOG_ERROR, "ASS encoder supports only one " "ASS rectangle field.\n"); @@ -93,7 +91,7 @@ static int ass_encode_frame(AVCodecContext *avctx, snprintf(ass_line, sizeof(ass_line), "%d,%ld,%s", ++s->id, layer, p); ass_line[strcspn(ass_line, "\r\n")] = 0; ass = ass_line; - } + len = av_strlcpy(buf+total_len, ass, bufsize-total_len); if (len > bufsize-total_len-1) { @@ -110,9 +108,9 @@ static int ass_encode_frame(AVCodecContext *avctx, #if CONFIG_SSA_ENCODER AVCodec ff_ssa_encoder = { .name = "ssa", - .long_name = NULL_IF_CONFIG_SMALL("SSA (SubStation Alpha) subtitle"), + .long_name = NULL_IF_CONFIG_SMALL("ASS (Advanced SubStation Alpha) subtitle"), .type = AVMEDIA_TYPE_SUBTITLE, - .id = AV_CODEC_ID_SSA, + .id = AV_CODEC_ID_ASS, .init = ass_encode_init, .encode_sub = ass_encode_frame, .priv_data_size = sizeof(ASSEncodeContext), |