generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

lavfi/color: drop support for old deprecated syntax

Browse Source
This commit is contained in:
Stefano Sabatini
2012-07-29 16:20:14 +02:00
parent ad2022ac83
commit e5d617aa6d
3 changed files with 1 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
doc/filters.texi
View File

@@ -3635,10 +3635,6 @@ Provide an uniformly colored input.
This source accepts list of options in the form of This source accepts list of options in the form of
@var{key}=@var{value} pairs separated by ":". @var{key}=@var{value} pairs separated by ":".
Alternatively, it accepts a string in the form
@var{color}:@var{size}:@var{rate}, but this syntax is
deprecated.
Follows the description of the accepted parameters. Follows the description of the accepted parameters.
@table @option @table @option

2
libavfilter/version.h
View File

@@ -30,7 +30,7 @@
#define LIBAVFILTER_VERSION_MAJOR 3 #define LIBAVFILTER_VERSION_MAJOR 3
#define LIBAVFILTER_VERSION_MINOR 5 #define LIBAVFILTER_VERSION_MINOR 5
#define LIBAVFILTER_VERSION_MICRO 100 #define LIBAVFILTER_VERSION_MICRO 101
#define LIBAVFILTER_VERSION_INT AV_VERSION_INT(LIBAVFILTER_VERSION_MAJOR, \ #define LIBAVFILTER_VERSION_INT AV_VERSION_INT(LIBAVFILTER_VERSION_MAJOR, \
LIBAVFILTER_VERSION_MINOR, \ LIBAVFILTER_VERSION_MINOR, \

24
libavfilter/vsrc_color.c
View File

@@ -64,21 +64,11 @@ AVFILTER_DEFINE_CLASS(color);
static av_cold int color_init(AVFilterContext *ctx, const char *args) static av_cold int color_init(AVFilterContext *ctx, const char *args)
{ {
ColorContext *color = ctx->priv; ColorContext *color = ctx->priv;
char color_string[128] = "black";
char frame_size [128] = "320x240";
char frame_rate [128] = "25";
AVRational frame_rate_q; AVRational frame_rate_q;
char *colon = 0, *equal = 0;
int ret = 0; int ret = 0;
color->class = &color_class; color->class = &color_class;
if (args) {
colon = strchr(args, ':');
equal = strchr(args, '=');
}
if (!args || (equal && (!colon || equal < colon))) {
av_opt_set_defaults(color); av_opt_set_defaults(color);
if ((ret = av_set_options_string(color, args, "=", ":")) < 0) { if ((ret = av_set_options_string(color, args, "=", ":")) < 0) {
av_log(ctx, AV_LOG_ERROR, "Error parsing options string: '%s'\n", args); av_log(ctx, AV_LOG_ERROR, "Error parsing options string: '%s'\n", args);
@@ -93,20 +83,6 @@ static av_cold int color_init(AVFilterContext *ctx, const char *args)
ret = AVERROR(EINVAL); ret = AVERROR(EINVAL);
goto end; goto end;
} }
} else {
av_log(ctx, AV_LOG_WARNING, "Flat options syntax is deprecated, use key=value pairs.\n");
sscanf(args, "%127[^:]:%127[^:]:%127s", color_string, frame_size, frame_rate);
if (av_parse_video_size(&color->w, &color->h, frame_size) < 0) {
av_log(ctx, AV_LOG_ERROR, "Invalid frame size: %s\n", frame_size);
return AVERROR(EINVAL);
}
if (av_parse_video_rate(&frame_rate_q, frame_rate) < 0) {
av_log(ctx, AV_LOG_ERROR, "Invalid frame rate: %s\n", frame_rate);
return AVERROR(EINVAL);
}
if (av_parse_color(color->color_rgba, color_string, -1, ctx) < 0)
return AVERROR(EINVAL);
}
color->time_base.num = frame_rate_q.den; color->time_base.num = frame_rate_q.den;
color->time_base.den = frame_rate_q.num; color->time_base.den = frame_rate_q.num;