summaryrefslogtreecommitdiff
path: root/libavfilter/vsrc_testsrc.c
diff options
context:
space:
mode:
authorClément Bœsch <ubitux@gmail.com>2013-05-23 13:54:08 +0200
committerClément Bœsch <ubitux@gmail.com>2013-05-23 17:22:05 +0200
commit288f9166430285224c689906d002499096acc1a9 (patch)
tree342ea78732d9342aceecb61cd032e666ee354b69 /libavfilter/vsrc_testsrc.c
parenteee19198ef5aed3b99ac0b136685bd28e6717f61 (diff)
lavfi/testsrc: move color options to the color scope filter definition.
Diffstat (limited to 'libavfilter/vsrc_testsrc.c')
-rw-r--r--libavfilter/vsrc_testsrc.c16
1 files changed, 7 insertions, 9 deletions
diff --git a/libavfilter/vsrc_testsrc.c b/libavfilter/vsrc_testsrc.c
index 8c4c51a158..a8a45a21ef 100644
--- a/libavfilter/vsrc_testsrc.c
+++ b/libavfilter/vsrc_testsrc.c
@@ -84,15 +84,6 @@ typedef struct {
{ "sar", "set video sample aspect ratio", OFFSET(sar), AV_OPT_TYPE_RATIONAL, {.dbl= 1}, 0, INT_MAX, FLAGS },
-static const AVOption color_options[] = {
- /* only used by color */
- { "color", "set color", OFFSET(color_rgba), AV_OPT_TYPE_COLOR, {.str = "black"}, CHAR_MIN, CHAR_MAX, FLAGS },
- { "c", "set color", OFFSET(color_rgba), AV_OPT_TYPE_COLOR, {.str = "black"}, CHAR_MIN, CHAR_MAX, FLAGS },
-
- COMMON_OPTIONS
- { NULL },
-};
-
static const AVOption options[] = {
COMMON_OPTIONS
/* only used by testsrc */
@@ -186,6 +177,13 @@ static int request_frame(AVFilterLink *outlink)
#if CONFIG_COLOR_FILTER
+static const AVOption color_options[] = {
+ { "color", "set color", OFFSET(color_rgba), AV_OPT_TYPE_COLOR, {.str = "black"}, CHAR_MIN, CHAR_MAX, FLAGS },
+ { "c", "set color", OFFSET(color_rgba), AV_OPT_TYPE_COLOR, {.str = "black"}, CHAR_MIN, CHAR_MAX, FLAGS },
+ COMMON_OPTIONS
+ { NULL }
+};
+
AVFILTER_DEFINE_CLASS(color);
static void color_fill_picture(AVFilterContext *ctx, AVFrame *picref)