generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

drawtext: drop unused draw_glyphs() arg "rgbcolor"

Browse Source 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Andrey Utkin 2014-06-22 17:31:09 +03:00 committed by Michael Niedermayer
parent 99497b4683
commit 3bb4d26a5d
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libavfilter/vf_drawtext.c
View File

@ -911,7 +911,7 @@ static int expand_text(AVFilterContext *ctx)
} }
static int draw_glyphs(DrawTextContext *s, AVFrame *frame, 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) FFDrawColor *color, int x, int y, int borderw)
{ {
char *text = s->expanded_text.str; 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); s->x, s->y, box_w, box_h);
if (s->shadowx || s->shadowy) { 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) &s->shadowcolor, s->shadowx, s->shadowy, 0)) < 0)
return ret; return ret;
} }
if (s->borderw) { 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) &s->bordercolor, 0, 0, s->borderw)) < 0)
return ret; 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) &s->fontcolor, 0, 0, 0)) < 0)
return ret; return ret;