diff options
| author | Andrey Utkin <andrey.krieger.utkin@gmail.com> | 2014-06-22 17:31:09 +0300 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-06-22 19:52:44 +0200 |
| commit | 3bb4d26a5df4197b0072247c468cd75c2e0e35bb (patch) | |
| tree | 6c8763c8b06ba3e0ac12d85f0299152e37c755ef /libavfilter | |
| parent | 99497b4683e5054bcdc5b6802a27d717df9e04f3 (diff) | |
| download | ffmpeg-3bb4d26a5df4197b0072247c468cd75c2e0e35bb.tar.gz | |
drawtext: drop unused draw_glyphs() arg "rgbcolor"
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavfilter')
| -rw-r--r-- | libavfilter/vf_drawtext.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libavfilter/vf_drawtext.c b/libavfilter/vf_drawtext.c index 995a3e2ca3..adc587e154 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; |