RepoMirrors/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2025-01-03 21:42:09 +00:00
Code Issues Projects Releases Wiki Activity

lavfi/testsrc: move color options to the color scope filter definition.

Browse Source
This commit is contained in:
Clément Bœsch 2013-05-23 13:54:08 +02:00
parent eee19198ef
commit 288f916643
1 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
libavfilter/vsrc_testsrc.c
View File

@ -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)