RepoMirrors/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2024-12-24 16:22:37 +00:00
Code Issues Projects Releases Wiki Activity

lavfi/pad: switch to AV_OPT_TYPE_COLOR

Browse Source 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
This commit is contained in:
Paul B Mahol 2013-05-13 15:08:40 +00:00
parent 1d2ecf9609
commit 85e8a1169c
1 changed files with 1 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
libavfilter/vf_pad.c
View File

@ -88,22 +88,11 @@ typedef struct {
char *h_expr; ///< height expression string char *h_expr; ///< height expression string
char *x_expr; ///< width expression string char *x_expr; ///< width expression string
char *y_expr; ///< height expression string char *y_expr; ///< height expression string
char *color_str;
uint8_t rgba_color[4]; ///< color for the padding area uint8_t rgba_color[4]; ///< color for the padding area
FFDrawContext draw; FFDrawContext draw;
FFDrawColor color; FFDrawColor color;
} PadContext; } PadContext;
static av_cold int init(AVFilterContext *ctx)
{
PadContext *s = ctx->priv;
if (av_parse_color(s->rgba_color, s->color_str, -1, ctx) < 0)
return AVERROR(EINVAL);
return 0;
}
static int config_input(AVFilterLink *inlink) static int config_input(AVFilterLink *inlink)
{ {
AVFilterContext *ctx = inlink->dst; AVFilterContext *ctx = inlink->dst;
@ -378,7 +367,7 @@ static const AVOption pad_options[] = {
{ "h", "set the pad area height expression", OFFSET(h_expr), AV_OPT_TYPE_STRING, {.str = "ih"}, CHAR_MIN, CHAR_MAX, FLAGS }, { "h", "set the pad area height expression", OFFSET(h_expr), AV_OPT_TYPE_STRING, {.str = "ih"}, CHAR_MIN, CHAR_MAX, FLAGS },
{ "x", "set the x offset expression for the input image position", OFFSET(x_expr), AV_OPT_TYPE_STRING, {.str = "0"}, CHAR_MIN, CHAR_MAX, FLAGS }, { "x", "set the x offset expression for the input image position", OFFSET(x_expr), AV_OPT_TYPE_STRING, {.str = "0"}, CHAR_MIN, CHAR_MAX, FLAGS },
{ "y", "set the y offset expression for the input image position", OFFSET(y_expr), AV_OPT_TYPE_STRING, {.str = "0"}, CHAR_MIN, CHAR_MAX, FLAGS }, { "y", "set the y offset expression for the input image position", OFFSET(y_expr), AV_OPT_TYPE_STRING, {.str = "0"}, CHAR_MIN, CHAR_MAX, FLAGS },
{ "color", "set the color of the padded area border", OFFSET(color_str), AV_OPT_TYPE_STRING, {.str = "black"}, .flags = FLAGS }, { "color", "set the color of the padded area border", OFFSET(rgba_color), AV_OPT_TYPE_COLOR, {.str = "black"}, .flags = FLAGS },
{ NULL }, { NULL },
}; };
@ -410,7 +399,6 @@ AVFilter avfilter_vf_pad = {
.priv_size = sizeof(PadContext), .priv_size = sizeof(PadContext),
.priv_class = &pad_class, .priv_class = &pad_class,
.init = init,
.query_formats = query_formats, .query_formats = query_formats,
.inputs = avfilter_vf_pad_inputs, .inputs = avfilter_vf_pad_inputs,