[FFmpeg-devel] [PATCH 1/2] drawtext: drop unused draw_glyphs() arg "rgbcolor"
Andrey Utkin
andrey.krieger.utkin at gmail.com
Sun Jun 22 16:31:09 CEST 2014
---
libavfilter/vf_drawtext.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/libavfilter/vf_drawtext.c b/libavfilter/vf_drawtext.c
index 995a3e2..adc587e 100644
--- a/libavfilter/vf_drawtext.c
+++ b/libavfilter/vf_drawtext.c
@@ -911,7 +911,7 @@ static int expand_text(AVFilterContext *ctx)
}
static int draw_glyphs(DrawTextContext *s, AVFrame *frame,
- int width, int height, const uint8_t rgbcolor[4],
+ int width, int height,
FFDrawColor *color, int x, int y, int borderw)
{
char *text = s->expanded_text.str;
@@ -1105,17 +1105,17 @@ static int draw_text(AVFilterContext *ctx, AVFrame *frame,
s->x, s->y, box_w, box_h);
if (s->shadowx || s->shadowy) {
- if ((ret = draw_glyphs(s, frame, width, height, s->shadowcolor.rgba,
+ if ((ret = draw_glyphs(s, frame, width, height,
&s->shadowcolor, s->shadowx, s->shadowy, 0)) < 0)
return ret;
}
if (s->borderw) {
- if ((ret = draw_glyphs(s, frame, width, height, s->bordercolor.rgba,
+ if ((ret = draw_glyphs(s, frame, width, height,
&s->bordercolor, 0, 0, s->borderw)) < 0)
return ret;
}
- if ((ret = draw_glyphs(s, frame, width, height, s->fontcolor.rgba,
+ if ((ret = draw_glyphs(s, frame, width, height,
&s->fontcolor, 0, 0, 0)) < 0)
return ret;
--
1.8.3.2
More information about the ffmpeg-devel
mailing list