From 3d258696057d599d0d9c3b8f73c9a55ec3355782 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cl=C3=A9ment=20B=C5=93sch?= Date: Sun, 19 Oct 2014 21:03:57 +0200 Subject: [PATCH] avcodec/ass: assume raw=0 in ff_ass_add_rect_bprint --- libavcodec/ass.c | 4 ++-- libavcodec/ass.h | 4 ++-- libavcodec/jacosubdec.c | 2 +- libavcodec/microdvddec.c | 2 +- libavcodec/movtextdec.c | 2 +- libavcodec/mpl2dec.c | 2 +- libavcodec/realtextdec.c | 2 +- libavcodec/samidec.c | 2 +- libavcodec/srtdec.c | 2 +- libavcodec/subviewerdec.c | 2 +- libavcodec/textdec.c | 2 +- libavcodec/webvttdec.c | 2 +- 12 files changed, 14 insertions(+), 14 deletions(-) diff --git a/libavcodec/ass.c b/libavcodec/ass.c index fd00981a68..398a805da5 100644 --- a/libavcodec/ass.c +++ b/libavcodec/ass.c @@ -175,11 +175,11 @@ err: } int ff_ass_add_rect_bprint(AVSubtitle *sub, const AVBPrint *buf, - int ts_start, int duration, int raw) + int ts_start, int duration) { if (!av_bprint_is_complete(buf)) return AVERROR(ENOMEM); - return ff_ass_add_rect(sub, buf->str, ts_start, duration, raw); + return ff_ass_add_rect(sub, buf->str, ts_start, duration, 0); } void ff_ass_bprint_text_event(AVBPrint *buf, const char *p, int size, diff --git a/libavcodec/ass.h b/libavcodec/ass.h index 5ed947ad9e..08dcfdca6e 100644 --- a/libavcodec/ass.h +++ b/libavcodec/ass.h @@ -93,10 +93,10 @@ int ff_ass_add_rect(AVSubtitle *sub, const char *dialog, /** * Same as ff_ass_add_rect_bprint, but taking an AVBPrint buffer instead of a - * string. + * string, and assuming raw=0. */ int ff_ass_add_rect_bprint(AVSubtitle *sub, const AVBPrint *buf, - int ts_start, int duration, int raw); + int ts_start, int duration); /** * Add an ASS dialog line to an AVBPrint buffer. diff --git a/libavcodec/jacosubdec.c b/libavcodec/jacosubdec.c index bb9d6aaa59..e83fadabce 100644 --- a/libavcodec/jacosubdec.c +++ b/libavcodec/jacosubdec.c @@ -185,7 +185,7 @@ static int jacosub_decode_frame(AVCodecContext *avctx, av_bprint_init(&buffer, JSS_MAX_LINESIZE, JSS_MAX_LINESIZE); jacosub_to_ass(avctx, &buffer, ptr); - ret = ff_ass_add_rect_bprint(sub, &buffer, avpkt->pts, avpkt->duration, 0); + ret = ff_ass_add_rect_bprint(sub, &buffer, avpkt->pts, avpkt->duration); av_bprint_finalize(&buffer, NULL); if (ret < 0) return ret; diff --git a/libavcodec/microdvddec.c b/libavcodec/microdvddec.c index dda7f8105f..a60545018a 100644 --- a/libavcodec/microdvddec.c +++ b/libavcodec/microdvddec.c @@ -298,7 +298,7 @@ static int microdvd_decode_frame(AVCodecContext *avctx, av_rescale_q(duration, avctx->time_base, (AVRational){1,100}) : -1; av_bprintf(&new_line, "\r\n"); - ret = ff_ass_add_rect_bprint(sub, &new_line, ts_start, ts_duration, 0); + ret = ff_ass_add_rect_bprint(sub, &new_line, ts_start, ts_duration); av_bprint_finalize(&new_line, NULL); if (ret < 0) return ret; diff --git a/libavcodec/movtextdec.c b/libavcodec/movtextdec.c index 18cfa949f7..208aa46829 100644 --- a/libavcodec/movtextdec.c +++ b/libavcodec/movtextdec.c @@ -96,7 +96,7 @@ static int mov_text_decode_frame(AVCodecContext *avctx, // Note that the spec recommends lines be no longer than 2048 characters. av_bprint_init(&buf, 0, AV_BPRINT_SIZE_UNLIMITED); text_to_ass(&buf, ptr, end); - ret = ff_ass_add_rect_bprint(sub, &buf, ts_start, ts_end-ts_start, 0); + ret = ff_ass_add_rect_bprint(sub, &buf, ts_start, ts_end-ts_start); av_bprint_finalize(&buf, NULL); if (ret < 0) return ret; diff --git a/libavcodec/mpl2dec.c b/libavcodec/mpl2dec.c index 5cce6d5e1b..8156d1eb8c 100644 --- a/libavcodec/mpl2dec.c +++ b/libavcodec/mpl2dec.c @@ -76,7 +76,7 @@ static int mpl2_decode_frame(AVCodecContext *avctx, void *data, av_bprint_init(&buf, 0, AV_BPRINT_SIZE_UNLIMITED); if (ptr && avpkt->size > 0 && *ptr && !mpl2_event_to_ass(&buf, ptr)) - ret = ff_ass_add_rect_bprint(sub, &buf, ts_start, ts_duration, 0); + ret = ff_ass_add_rect_bprint(sub, &buf, ts_start, ts_duration); av_bprint_finalize(&buf, NULL); if (ret < 0) return ret; diff --git a/libavcodec/realtextdec.c b/libavcodec/realtextdec.c index 602df4cbfe..23bd9d7abc 100644 --- a/libavcodec/realtextdec.c +++ b/libavcodec/realtextdec.c @@ -68,7 +68,7 @@ static int realtext_decode_frame(AVCodecContext *avctx, // note: no need to rescale pts & duration since they are in the same // timebase as ASS (1/100) if (ptr && avpkt->size > 0 && !rt_event_to_ass(&buf, ptr)) - ret = ff_ass_add_rect_bprint(sub, &buf, avpkt->pts, avpkt->duration, 0); + ret = ff_ass_add_rect_bprint(sub, &buf, avpkt->pts, avpkt->duration); av_bprint_finalize(&buf, NULL); if (ret < 0) return ret; diff --git a/libavcodec/samidec.c b/libavcodec/samidec.c index 8616288b49..b2395a1343 100644 --- a/libavcodec/samidec.c +++ b/libavcodec/samidec.c @@ -122,7 +122,7 @@ static int sami_decode_frame(AVCodecContext *avctx, int ts_start = av_rescale_q(avpkt->pts, avctx->time_base, (AVRational){1,100}); int ts_duration = avpkt->duration != -1 ? av_rescale_q(avpkt->duration, avctx->time_base, (AVRational){1,100}) : -1; - int ret = ff_ass_add_rect_bprint(sub, &sami->full, ts_start, ts_duration, 0); + int ret = ff_ass_add_rect_bprint(sub, &sami->full, ts_start, ts_duration); if (ret < 0) return ret; } diff --git a/libavcodec/srtdec.c b/libavcodec/srtdec.c index d9cc16a344..54abe5dd39 100644 --- a/libavcodec/srtdec.c +++ b/libavcodec/srtdec.c @@ -217,7 +217,7 @@ static int srt_decode_frame(AVCodecContext *avctx, (AVRational){1,100}); srt_to_ass(avctx, &buffer, avpkt->data, x1, y1, x2, y2); - ret = ff_ass_add_rect_bprint(sub, &buffer, ts_start, ts_end-ts_start, 0); + ret = ff_ass_add_rect_bprint(sub, &buffer, ts_start, ts_end-ts_start); av_bprint_finalize(&buffer, NULL); if (ret < 0) return ret; diff --git a/libavcodec/subviewerdec.c b/libavcodec/subviewerdec.c index 4af5926490..82cb8cf85d 100644 --- a/libavcodec/subviewerdec.c +++ b/libavcodec/subviewerdec.c @@ -59,7 +59,7 @@ static int subviewer_decode_frame(AVCodecContext *avctx, // note: no need to rescale pts & duration since they are in the same // timebase as ASS (1/100) if (ptr && avpkt->size > 0 && !subviewer_event_to_ass(&buf, ptr)) - ret = ff_ass_add_rect_bprint(sub, &buf, avpkt->pts, avpkt->duration, 0); + ret = ff_ass_add_rect_bprint(sub, &buf, avpkt->pts, avpkt->duration); av_bprint_finalize(&buf, NULL); if (ret < 0) return ret; diff --git a/libavcodec/textdec.c b/libavcodec/textdec.c index ba189e8900..611fcc8bf2 100644 --- a/libavcodec/textdec.c +++ b/libavcodec/textdec.c @@ -56,7 +56,7 @@ static int text_decode_frame(AVCodecContext *avctx, void *data, av_bprint_init(&buf, 0, AV_BPRINT_SIZE_UNLIMITED); if (ptr && avpkt->size > 0 && *ptr) { ff_ass_bprint_text_event(&buf, ptr, avpkt->size, text->linebreaks, text->keep_ass_markup); - ret = ff_ass_add_rect_bprint(sub, &buf, ts_start, ts_duration, 0); + ret = ff_ass_add_rect_bprint(sub, &buf, ts_start, ts_duration); } av_bprint_finalize(&buf, NULL); if (ret < 0) diff --git a/libavcodec/webvttdec.c b/libavcodec/webvttdec.c index 8ca017bee7..66f5071ebe 100644 --- a/libavcodec/webvttdec.c +++ b/libavcodec/webvttdec.c @@ -84,7 +84,7 @@ static int webvtt_decode_frame(AVCodecContext *avctx, int ts_start = av_rescale_q(avpkt->pts, avctx->time_base, (AVRational){1,100}); int ts_duration = avpkt->duration != -1 ? av_rescale_q(avpkt->duration, avctx->time_base, (AVRational){1,100}) : -1; - ret = ff_ass_add_rect_bprint(sub, &buf, ts_start, ts_duration, 0); + ret = ff_ass_add_rect_bprint(sub, &buf, ts_start, ts_duration); } av_bprint_finalize(&buf, NULL); if (ret < 0)