Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Andrey Utkin authored on 2014/06/22 23:31:09... | ... |
@@ -911,7 +911,7 @@ static int expand_text(AVFilterContext *ctx) |
911 | 911 |
} |
912 | 912 |
|
913 | 913 |
static int draw_glyphs(DrawTextContext *s, AVFrame *frame, |
914 |
- int width, int height, const uint8_t rgbcolor[4], |
|
914 |
+ int width, int height, |
|
915 | 915 |
FFDrawColor *color, int x, int y, int borderw) |
916 | 916 |
{ |
917 | 917 |
char *text = s->expanded_text.str; |
... | ... |
@@ -1105,17 +1105,17 @@ static int draw_text(AVFilterContext *ctx, AVFrame *frame, |
1105 | 1105 |
s->x, s->y, box_w, box_h); |
1106 | 1106 |
|
1107 | 1107 |
if (s->shadowx || s->shadowy) { |
1108 |
- if ((ret = draw_glyphs(s, frame, width, height, s->shadowcolor.rgba, |
|
1108 |
+ if ((ret = draw_glyphs(s, frame, width, height, |
|
1109 | 1109 |
&s->shadowcolor, s->shadowx, s->shadowy, 0)) < 0) |
1110 | 1110 |
return ret; |
1111 | 1111 |
} |
1112 | 1112 |
|
1113 | 1113 |
if (s->borderw) { |
1114 |
- if ((ret = draw_glyphs(s, frame, width, height, s->bordercolor.rgba, |
|
1114 |
+ if ((ret = draw_glyphs(s, frame, width, height, |
|
1115 | 1115 |
&s->bordercolor, 0, 0, s->borderw)) < 0) |
1116 | 1116 |
return ret; |
1117 | 1117 |
} |
1118 |
- if ((ret = draw_glyphs(s, frame, width, height, s->fontcolor.rgba, |
|
1118 |
+ if ((ret = draw_glyphs(s, frame, width, height, |
|
1119 | 1119 |
&s->fontcolor, 0, 0, 0)) < 0) |
1120 | 1120 |
return ret; |
1121 | 1121 |
|