sigrid/ffmpeg

doc/filters.texi+44−54

@@ -1117,6 +1117,8 @@ minimum detected noise duration. · 1116 unmodified lines
1117		1117
1118	The printed times and duration are expressed in seconds.	1118	The printed times and duration are expressed in seconds.
1119		1119
		1120	The filter accepts the following options:
		1121
1120	@table @option	1122	@table @option
1121	@item duration, d	1123	@item duration, d
1122	Set silence duration until notification (default is 2 seconds).	1124	Set silence duration until notification (default is 2 seconds).
@@ -2100,12 +2102,8 @@ boxblur=luma_radius=min(h\,w)/10:luma_power=1:chroma_radius=min(cw\,ch)/10:chrom · 977 unmodified lines
2100		2102
2101	Convert color matrix.	2103	Convert color matrix.
2102		2104
2103	The filter accepts parameters as a list of @var{key}=@var{value}	2105	The filter accepts the following options:
2104	pairs, separated by ":". If the key of the first options is omitted,
2105	the arguments are interpreted according to the syntax
2106	@var{src}:@var{dst}.
2107		2106
2108	A description of the accepted options follows:
2109	@table @option	2107	@table @option
2110	@item src	2108	@item src
2111	@item dst	2109	@item dst
@@ -2371,30 +2369,15 @@ If there is no key point defined in @code{x=0}, the filter will automatically · 259 unmodified lines
2371	insert a @var{(0;0)} point. In the same way, if there is no key point defined	2369	insert a @var{(0;0)} point. In the same way, if there is no key point defined
2372	in @code{x=1}, the filter will automatically insert a @var{(1;1)} point.	2370	in @code{x=1}, the filter will automatically insert a @var{(1;1)} point.
2373		2371
2374	The filter accepts parameters as a list of @var{key}=@var{value}	2372	The filter accepts the following options:
2375	pairs, separated by ":". If the key of the first options is omitted,
2376	the arguments are interpreted according to the syntax
2377	curves[=@var{preset}].
2378
2379	A description of the accepted parameters follows.
2380		2373
2381	@table @option	2374	@table @option
2382	@item red, r
2383	Set the key points for the red component.
2384	@item green, g
2385	Set the key points for the green component.
2386	@item blue, b
2387	Set the key points for the blue component.
2388	@item all
2389	Set the key points for all components.
2390	Can be used in addition to the other key points component
2391	options. In this case, the unset component(s) will fallback on this
2392	@option{all} setting.
2393	@item preset	2375	@item preset
2394	Select one of the available color presets. This option can not be used in	2376	Select one of the available color presets. This option can not be used in
2395	addition to the @option{r}, @option{g}, @option{b} parameters.	2377	addition to the @option{r}, @option{g}, @option{b} parameters.
2396	Available presets are:	2378	Available presets are:
2397	@table @samp	2379	@table @samp
		2380	@item none
2398	@item color_negative	2381	@item color_negative
2399	@item cross_process	2382	@item cross_process
2400	@item darker	2383	@item darker
@@ -2406,7 +2389,18 @@ Available presets are: · 5 unmodified lines
2406	@item strong_contrast	2389	@item strong_contrast
2407	@item vintage	2390	@item vintage
2408	@end table	2391	@end table
2409	Default is unset.	2392	Default is @code{none}.
		2393	@item red, r
		2394	Set the key points for the red component.
		2395	@item green, g
		2396	Set the key points for the green component.
		2397	@item blue, b
		2398	Set the key points for the blue component.
		2399	@item all
		2400	Set the key points for all components.
		2401	Can be used in addition to the other key points component
		2402	options. In this case, the unset component(s) will fallback on this
		2403	@option{all} setting.
2410	@end table	2404	@end table
2411		2405
2412	To avoid some filtergraph syntax conflicts, each key points list need to be	2406	To avoid some filtergraph syntax conflicts, each key points list need to be
@@ -3014,7 +3008,7 @@ For more information about fontconfig, check: · 601 unmodified lines
3014		3008
3015	Detect and draw edges. The filter uses the Canny Edge Detection algorithm.	3009	Detect and draw edges. The filter uses the Canny Edge Detection algorithm.
3016		3010
3017	This filter accepts the following optional named parameters:	3011	The filter accepts the following options:
3018		3012
3019	@table @option	3013	@table @option
3020	@item low, high	3014	@item low, high
@@ -3308,11 +3302,7 @@ For more information see: · 287 unmodified lines
3308		3302
3309	@section geq	3303	@section geq
3310		3304
3311	The filter takes one, two, three or four equations as parameter, separated by ':'.	3305	The filter accepts the following options:
3312	The first equation is mandatory and applies to the luma plane. The two
3313	following are respectively for chroma blue and chroma red planes.
3314
3315	The filter syntax allows named parameters:
3316		3306
3317	@table @option	3307	@table @option
3318	@item lum_expr	3308	@item lum_expr
@@ -4615,6 +4605,13 @@ Subfilters must be separated by '/' and can be disabled by prepending a '-'. · 1296 unmodified lines
4615	Each subfilter and some options have a short and a long name that can be used	4605	Each subfilter and some options have a short and a long name that can be used
4616	interchangeably, i.e. dr/dering are the same.	4606	interchangeably, i.e. dr/dering are the same.
4617		4607
		4608	The filters accept the following options:
		4609
		4610	@table @option
		4611	@item subfilters
		4612	Set postprocessing subfilters string.
		4613	@end table
		4614
4618	All subfilters share common options to determine their scope:	4615	All subfilters share common options to determine their scope:
4619		4616
4620	@table @option	4617	@table @option
@@ -4631,12 +4628,12 @@ Do luminance filtering only (no chrominance). · 10 unmodified lines
4631	Do chrominance filtering only (no luminance).	4628	Do chrominance filtering only (no luminance).
4632	@end table	4629	@end table
4633		4630
4634	These options can be appended after the subfilter name, separated by a ':'.	4631	These options can be appended after the subfilter name, separated by a '\|'.
4635		4632
4636	Available subfilters are:	4633	Available subfilters are:
4637		4634
4638	@table @option	4635	@table @option
4639	@item hb/hdeblock[:difference[:flatness]]	4636	@item hb/hdeblock[\|difference[\|flatness]]
4640	Horizontal deblocking filter	4637	Horizontal deblocking filter
4641	@table @option	4638	@table @option
4642	@item difference	4639	@item difference
@@ -4645,7 +4642,7 @@ Difference factor where higher values mean more deblocking (default: @code{32}). · 2 unmodified lines
4645	Flatness threshold where lower values mean more deblocking (default: @code{39}).	4642	Flatness threshold where lower values mean more deblocking (default: @code{39}).
4646	@end table	4643	@end table
4647		4644
4648	@item vb/vdeblock[:difference[:flatness]]	4645	@item vb/vdeblock[\|difference[\|flatness]]
4649	Vertical deblocking filter	4646	Vertical deblocking filter
4650	@table @option	4647	@table @option
4651	@item difference	4648	@item difference
@@ -4654,7 +4651,7 @@ Difference factor where higher values mean more deblocking (default: @code{32}). · 2 unmodified lines
4654	Flatness threshold where lower values mean more deblocking (default: @code{39}).	4651	Flatness threshold where lower values mean more deblocking (default: @code{39}).
4655	@end table	4652	@end table
4656		4653
4657	@item ha/hadeblock[:difference[:flatness]]	4654	@item ha/hadeblock[\|difference[\|flatness]]
4658	Accurate horizontal deblocking filter	4655	Accurate horizontal deblocking filter
4659	@table @option	4656	@table @option
4660	@item difference	4657	@item difference
@@ -4663,7 +4660,7 @@ Difference factor where higher values mean more deblocking (default: @code{32}). · 2 unmodified lines
4663	Flatness threshold where lower values mean more deblocking (default: @code{39}).	4660	Flatness threshold where lower values mean more deblocking (default: @code{39}).
4664	@end table	4661	@end table
4665		4662
4666	@item va/vadeblock[:difference[:flatness]]	4663	@item va/vadeblock[\|difference[\|flatness]]
4667	Accurate vertical deblocking filter	4664	Accurate vertical deblocking filter
4668	@table @option	4665	@table @option
4669	@item difference	4666	@item difference
@@ -4687,7 +4684,7 @@ Experimental vertical deblocking filter · 17 unmodified lines
4687	@item dr/dering	4684	@item dr/dering
4688	Deringing filter	4685	Deringing filter
4689		4686
4690	@item tn/tmpnoise[:threshold1[:threshold2[:threshold3]]], temporal noise reducer	4687	@item tn/tmpnoise[\|threshold1[\|threshold2[\|threshold3]]], temporal noise reducer
4691	@table @option	4688	@table @option
4692	@item threshold1	4689	@item threshold1
4693	larger -> stronger filtering	4690	larger -> stronger filtering
@@ -4727,7 +4724,7 @@ second line with a @code{(-1 4 2 4 -1)} filter. · 33 unmodified lines
4727	Vertically applied FIR lowpass deinterlacing filter that deinterlaces the given	4724	Vertically applied FIR lowpass deinterlacing filter that deinterlaces the given
4728	block by filtering all lines with a @code{(-1 2 6 2 -1)} filter.	4725	block by filtering all lines with a @code{(-1 2 6 2 -1)} filter.
4729		4726
4730	@item fq/forceQuant[:quantizer]	4727	@item fq/forceQuant[\|quantizer]
4731	Overrides the quantizer table from the input with the constant quantizer you	4728	Overrides the quantizer table from the input with the constant quantizer you
4732	specify.	4729	specify.
4733	@table @option	4730	@table @option
@@ -4736,13 +4733,13 @@ Quantizer to use · 2 unmodified lines
4736	@end table	4733	@end table
4737		4734
4738	@item de/default	4735	@item de/default
4739	Default pp filter combination (@code{hb:a,vb:a,dr:a})	4736	Default pp filter combination (@code{hb\|a,vb\|a,dr\|a})
4740		4737
4741	@item fa/fast	4738	@item fa/fast
4742	Fast pp filter combination (@code{h1:a,v1:a,dr:a})	4739	Fast pp filter combination (@code{h1\|a,v1\|a,dr\|a})
4743		4740
4744	@item ac	4741	@item ac
4745	High quality pp filter combination (@code{ha:a:128:7,va:a,dr:a})	4742	High quality pp filter combination (@code{ha\|a\|128\|7,va\|a,dr\|a})
4746	@end table	4743	@end table
4747		4744
4748	@subsection Examples	4745	@subsection Examples
@@ -4764,14 +4761,14 @@ pp=de/-al · 15 unmodified lines
4764	@item	4761	@item
4765	Apply default filters and temporal denoiser:	4762	Apply default filters and temporal denoiser:
4766	@example	4763	@example
4767	pp=default/tmpnoise:1:2:3	4764	pp=default/tmpnoise\|1\|2\|3
4768	@end example	4765	@end example
4769		4766
4770	@item	4767	@item
4771	Apply deblocking on luminance only, and switch vertical deblocking on or off	4768	Apply deblocking on luminance only, and switch vertical deblocking on or off
4772	automatically depending on available CPU time:	4769	automatically depending on available CPU time:
4773	@example	4770	@example
4774	pp=hb:y/vb:a	4771	pp=hb\|y/vb\|a
4775	@end example	4772	@end example
4776	@end itemize	4773	@end itemize
4777		4774
@@ -5325,8 +5322,7 @@ To enable compilation of this filter you need to configure FFmpeg with · 547 unmodified lines
5325	libavformat to convert the passed subtitles file to ASS (Advanced Substation	5322	libavformat to convert the passed subtitles file to ASS (Advanced Substation
5326	Alpha) subtitles format.	5323	Alpha) subtitles format.
5327		5324
5328	This filter accepts the following named options, expressed as a	5325	The filter accepts the following options:
5329	sequence of @var{key}=@var{value} pairs, separated by ":".
5330		5326
5331	@table @option	5327	@table @option
5332	@item filename, f	5328	@item filename, f
@@ -5392,10 +5388,7 @@ Swap U & V plane. · 59 unmodified lines
5392	@section thumbnail	5388	@section thumbnail
5393	Select the most representative frame in a given sequence of consecutive frames.	5389	Select the most representative frame in a given sequence of consecutive frames.
5394		5390
5395	The filter accepts parameters as a list of @var{key}=@var{value}	5391	The filter accepts the following options:
5396	pairs, separated by ":". If the key of the first options is omitted,
5397	the arguments are interpreted according to the syntax
5398	thumbnail[=@var{n}].
5399		5392
5400	@table @option	5393	@table @option
5401	@item n	5394	@item n
@@ -6345,11 +6338,7 @@ Set read/write permissions for the output frames. · 943 unmodified lines
6345	These filters are mainly aimed at developers to test direct path in the	6338	These filters are mainly aimed at developers to test direct path in the
6346	following filter in the filtergraph.	6339	following filter in the filtergraph.
6347		6340
6348	The filters accept parameters as a list of @var{key}=@var{value} pairs,	6341	The filters accept the following options:
6349	separated by ":". If the key of the first options is omitted, the argument is
6350	assumed to be the @var{mode}.
6351
6352	A description of the accepted parameters follows.
6353		6342
6354	@table @option	6343	@table @option
6355	@item mode	6344	@item mode
@@ -6848,7 +6837,7 @@ the momentary loudness (400 milliseconds). · 492 unmodified lines
6848	More information about the Loudness Recommendation EBU R128 on	6837	More information about the Loudness Recommendation EBU R128 on
6849	@url{http://tech.ebu.ch/loudness}.	6838	@url{http://tech.ebu.ch/loudness}.
6850		6839
6851	The filter accepts the following named parameters:	6840	The filter accepts the following options:
6852		6841
6853	@table @option	6842	@table @option
6854		6843
@@ -7036,7 +7025,8 @@ do not have exactly the same duration in the first file. · 181 unmodified lines
7036	Convert input audio to a video output, representing the audio frequency	7025	Convert input audio to a video output, representing the audio frequency
7037	spectrum.	7026	spectrum.
7038		7027
7039	The filter accepts the following named parameters:	7028	The filter accepts the following options:
		7029
7040	@table @option	7030	@table @option
7041	@item size, s	7031	@item size, s
7042	Specify the video size for the output. Default value is @code{640x512}.	7032	Specify the video size for the output. Default value is @code{640x512}.

libavfilter/af_silencedetect.c+0−17

@@ -54,22 +54,6 @@ static const AVOption silencedetect_options[] = { · 53 unmodified lines
54		54
55	AVFILTER_DEFINE_CLASS(silencedetect);	55	AVFILTER_DEFINE_CLASS(silencedetect);
56		56
57	static av_cold int init(AVFilterContext ctx, const char args)
58	{
59	int ret;
60	SilenceDetectContext *silence = ctx->priv;
61
62	silence->class = &silencedetect_class;
63	av_opt_set_defaults(silence);
64
65	if ((ret = av_set_options_string(silence, args, "=", ":")) < 0)
66	return ret;
67
68	av_opt_free(silence);
69
70	return 0;
71	}
72
73	static char get_metadata_val(AVFrame insamples, const char *key)	57	static char get_metadata_val(AVFrame insamples, const char *key)
74	{	58	{
75	AVDictionaryEntry *e = av_dict_get(insamples->metadata, key, NULL, 0);	59	AVDictionaryEntry *e = av_dict_get(insamples->metadata, key, NULL, 0);
@@ -176,7 +160,6 @@ AVFilter avfilter_af_silencedetect = { · 100 unmodified lines
176	.name = "silencedetect",	160	.name = "silencedetect",
177	.description = NULL_IF_CONFIG_SMALL("Detect silence."),	161	.description = NULL_IF_CONFIG_SMALL("Detect silence."),
178	.priv_size = sizeof(SilenceDetectContext),	162	.priv_size = sizeof(SilenceDetectContext),
179	.init = init,
180	.query_formats = query_formats,	163	.query_formats = query_formats,
181	.inputs = silencedetect_inputs,	164	.inputs = silencedetect_inputs,
182	.outputs = silencedetect_outputs,	165	.outputs = silencedetect_outputs,

libavfilter/avf_showspectrum.c+0−15

@@ -97,20 +97,6 @@ static const struct { · 96 unmodified lines
97	{ 1, 1, 0, 0 }	97	{ 1, 1, 0, 0 }
98	};	98	};
99		99
100	static av_cold int init(AVFilterContext ctx, const char args)
101	{
102	ShowSpectrumContext *showspectrum = ctx->priv;
103	int err;
104
105	showspectrum->class = &showspectrum_class;
106	av_opt_set_defaults(showspectrum);
107
108	if ((err = av_set_options_string(showspectrum, args, "=", ":")) < 0)
109	return err;
110
111	return 0;
112	}
113
114	static av_cold void uninit(AVFilterContext *ctx)	100	static av_cold void uninit(AVFilterContext *ctx)
115	{	101	{
116	ShowSpectrumContext *showspectrum = ctx->priv;	102	ShowSpectrumContext *showspectrum = ctx->priv;
@@ -505,7 +491,6 @@ static const AVFilterPad showspectrum_outputs[] = { · 388 unmodified lines
505	AVFilter avfilter_avf_showspectrum = {	491	AVFilter avfilter_avf_showspectrum = {
506	.name = "showspectrum",	492	.name = "showspectrum",
507	.description = NULL_IF_CONFIG_SMALL("Convert input audio to a spectrum video output."),	493	.description = NULL_IF_CONFIG_SMALL("Convert input audio to a spectrum video output."),
508	.init = init,
509	.uninit = uninit,	494	.uninit = uninit,
510	.query_formats = query_formats,	495	.query_formats = query_formats,
511	.priv_size = sizeof(ShowSpectrumContext),	496	.priv_size = sizeof(ShowSpectrumContext),

libavfilter/avfilter.c+13−0

     int ret=0;
     int anton_options =
         !strcmp(filter->filter->name,  "aformat") ||
+        !strcmp(filter->filter->name,  "ass")     ||
         !strcmp(filter->filter->name,  "blackframe") ||
         !strcmp(filter->filter->name,  "boxblur"   ) ||
+        !strcmp(filter->filter->name,  "colormatrix") ||
         !strcmp(filter->filter->name,  "crop"      ) ||
         !strcmp(filter->filter->name,  "cropdetect") ||
+        !strcmp(filter->filter->name,  "curves"    ) ||
         !strcmp(filter->filter->name,  "delogo"    ) ||
         !strcmp(filter->filter->name,  "drawbox"   ) ||
         !strcmp(filter->filter->name,  "drawtext"  ) ||
+        !strcmp(filter->filter->name,  "ebur128"   ) ||
+        !strcmp(filter->filter->name,  "edgedetect") ||
         !strcmp(filter->filter->name,  "fade"      ) ||
         !strcmp(filter->filter->name,  "fieldorder") ||
         !strcmp(filter->filter->name,  "fps"       ) ||
         !strcmp(filter->filter->name,  "frei0r"    ) ||
         !strcmp(filter->filter->name,  "frei0r_src") ||
+        !strcmp(filter->filter->name,  "geq"       ) ||
         !strcmp(filter->filter->name, "gradfun"    ) ||
         !strcmp(filter->filter->name, "hqdn3d"     ) ||
         !strcmp(filter->filter->name, "ocv"        ) ||
         !strcmp(filter->filter->name, "pad"        ) ||
         !strcmp(filter->filter->name,   "format") ||
         !strcmp(filter->filter->name, "noformat") ||
+        !strcmp(filter->filter->name, "perms")  ||
+        !strcmp(filter->filter->name, "pp"   )  ||
+        !strcmp(filter->filter->name, "aperms") ||
         !strcmp(filter->filter->name, "resample") ||
+        !strcmp(filter->filter->name, "showspectrum") ||
+        !strcmp(filter->filter->name, "silencedetect") ||
+        !strcmp(filter->filter->name, "subtitles") ||
+        !strcmp(filter->filter->name, "thumbnail") ||
 //         !strcmp(filter->filter->name, "scale"      ) ||
         !strcmp(filter->filter->name, "select") ||
         0

libavfilter/f_ebur128.c+0−7

 static av_cold int init(AVFilterContext *ctx, const char *args)
 {
-    int ret;
     EBUR128Context *ebur128 = ctx->priv;
     AVFilterPad pad;
-    ebur128->class = &ebur128_class;
-    av_opt_set_defaults(ebur128);
-    if ((ret = av_set_options_string(ebur128, args, "=", ":")) < 0)
-        return ret;
     if (ebur128->loglevel != AV_LOG_INFO &&
         ebur128->loglevel != AV_LOG_VERBOSE) {
         if (ebur128->do_video || ebur128->metadata)

libavfilter/f_perms.c+0−4

     return ret;
 }
-static const char *const shorthand[] = { "mode", NULL };
 #if CONFIG_APERMS_FILTER
 #define aperms_options options
     .inputs      = aperms_inputs,
     .outputs     = aperms_outputs,
     .priv_class  = &aperms_class,
-    .shorthand   = shorthand,
 };
 #endif /* CONFIG_APERMS_FILTER */
     .inputs      = perms_inputs,
     .outputs     = perms_outputs,
     .priv_class  = &perms_class,
-    .shorthand   = shorthand,
 };
 #endif /* CONFIG_PERMS_FILTER */

libavfilter/vf_colormatrix.c+0−3

     { NULL }
 };
-static const char *const shorthand[] = { "src", "dst", NULL };
 AVFilter avfilter_vf_colormatrix = {
     .name          = "colormatrix",
     .description   = NULL_IF_CONFIG_SMALL("Convert color matrix."),
     .inputs        = colormatrix_inputs,
     .outputs       = colormatrix_outputs,
     .priv_class    = &colormatrix_class,
-    .shorthand     = shorthand,
 };

libavfilter/vf_curves.c+8−10

 #define OFFSET(x) offsetof(CurvesContext, x)
 #define FLAGS AV_OPT_FLAG_FILTERING_PARAM|AV_OPT_FLAG_VIDEO_PARAM
 static const AVOption curves_options[] = {
-    { "red",   "set red points coordinates",   OFFSET(comp_points_str[0]), AV_OPT_TYPE_STRING, {.str=NULL}, .flags = FLAGS },
-    { "r",     "set red points coordinates",   OFFSET(comp_points_str[0]), AV_OPT_TYPE_STRING, {.str=NULL}, .flags = FLAGS },
-    { "green", "set green points coordinates", OFFSET(comp_points_str[1]), AV_OPT_TYPE_STRING, {.str=NULL}, .flags = FLAGS },
-    { "g",     "set green points coordinates", OFFSET(comp_points_str[1]), AV_OPT_TYPE_STRING, {.str=NULL}, .flags = FLAGS },
-    { "blue",  "set blue points coordinates",  OFFSET(comp_points_str[2]), AV_OPT_TYPE_STRING, {.str=NULL}, .flags = FLAGS },
-    { "b",     "set blue points coordinates",  OFFSET(comp_points_str[2]), AV_OPT_TYPE_STRING, {.str=NULL}, .flags = FLAGS },
-    { "all",   "set points coordinates for all components",   OFFSET(comp_points_str_all),AV_OPT_TYPE_STRING, {.str=NULL}, .flags = FLAGS },
     { "preset", "select a color curves preset", OFFSET(preset), AV_OPT_TYPE_INT, {.i64=PRESET_NONE}, PRESET_NONE, NB_PRESETS-1, FLAGS, "preset_name" },
+        { "none",               NULL, 0, AV_OPT_TYPE_CONST, {.i64=PRESET_NONE},                 INT_MIN, INT_MAX, FLAGS, "preset_name" },
         { "color_negative",     NULL, 0, AV_OPT_TYPE_CONST, {.i64=PRESET_COLOR_NEGATIVE},       INT_MIN, INT_MAX, FLAGS, "preset_name" },
         { "cross_process",      NULL, 0, AV_OPT_TYPE_CONST, {.i64=PRESET_CROSS_PROCESS},        INT_MIN, INT_MAX, FLAGS, "preset_name" },
         { "darker",             NULL, 0, AV_OPT_TYPE_CONST, {.i64=PRESET_DARKER},               INT_MIN, INT_MAX, FLAGS, "preset_name" },
         { "negative",           NULL, 0, AV_OPT_TYPE_CONST, {.i64=PRESET_NEGATIVE},             INT_MIN, INT_MAX, FLAGS, "preset_name" },
         { "strong_contrast",    NULL, 0, AV_OPT_TYPE_CONST, {.i64=PRESET_STRONG_CONTRAST},      INT_MIN, INT_MAX, FLAGS, "preset_name" },
         { "vintage",            NULL, 0, AV_OPT_TYPE_CONST, {.i64=PRESET_VINTAGE},              INT_MIN, INT_MAX, FLAGS, "preset_name" },
+    { "red",   "set red points coordinates",   OFFSET(comp_points_str[0]), AV_OPT_TYPE_STRING, {.str=NULL}, .flags = FLAGS },
+    { "r",     "set red points coordinates",   OFFSET(comp_points_str[0]), AV_OPT_TYPE_STRING, {.str=NULL}, .flags = FLAGS },
+    { "green", "set green points coordinates", OFFSET(comp_points_str[1]), AV_OPT_TYPE_STRING, {.str=NULL}, .flags = FLAGS },
+    { "g",     "set green points coordinates", OFFSET(comp_points_str[1]), AV_OPT_TYPE_STRING, {.str=NULL}, .flags = FLAGS },
+    { "blue",  "set blue points coordinates",  OFFSET(comp_points_str[2]), AV_OPT_TYPE_STRING, {.str=NULL}, .flags = FLAGS },
+    { "b",     "set blue points coordinates",  OFFSET(comp_points_str[2]), AV_OPT_TYPE_STRING, {.str=NULL}, .flags = FLAGS },
+    { "all",   "set points coordinates for all components",   OFFSET(comp_points_str_all),AV_OPT_TYPE_STRING, {.str=NULL}, .flags = FLAGS },
     { NULL }
 };
      { NULL }
 };
-static const char *const shorthand[] = { "preset", NULL };
 AVFilter avfilter_vf_curves = {
     .name          = "curves",
     .description   = NULL_IF_CONFIG_SMALL("Adjust components curves."),
     .inputs        = curves_inputs,
     .outputs       = curves_outputs,
     .priv_class    = &curves_class,
-    .shorthand     = shorthand,
 };

libavfilter/vf_edgedetect.c+0−7

 static av_cold int init(AVFilterContext *ctx, const char *args)
 {
-    int ret;
     EdgeDetectContext *edgedetect = ctx->priv;
-    edgedetect->class = &edgedetect_class;
-    av_opt_set_defaults(edgedetect);
-    if ((ret = av_set_options_string(edgedetect, args, "=", ":")) < 0)
-        return ret;
     edgedetect->low_u8  = edgedetect->low  * 255. + .5;
     edgedetect->high_u8 = edgedetect->high * 255. + .5;
     return 0;

libavfilter/vf_geq.c+0−3

     { NULL }
 };
-static const char *const shorthand[] = { "lum_expr", "cb_expr", "cr_expr", "alpha_expr", NULL };
 AVFilter avfilter_vf_geq = {
     .name          = "geq",
     .description   = NULL_IF_CONFIG_SMALL("Apply generic equation to each pixel."),
     .inputs        = geq_inputs,
     .outputs       = geq_outputs,
     .priv_class    = &geq_class,
-    .shorthand     = shorthand,
 };

libavfilter/vf_pp.c+14−4

 #include "libpostproc/postprocess.h"
 typedef struct {
+    const AVClass *class;
+    char *subfilters;
     int mode_id;
     pp_mode *modes[PP_QUALITY_MAX + 1];
     void *pp_ctx;
 } PPFilterContext;
+#define OFFSET(x) offsetof(PPFilterContext, x)
+#define FLAGS AV_OPT_FLAG_FILTERING_PARAM|AV_OPT_FLAG_VIDEO_PARAM
+static const AVOption pp_options[] = {
+    { "subfilters", "set postprocess subfilters", OFFSET(subfilters), AV_OPT_TYPE_STRING, {.str="de"}, .flags = FLAGS },
+    { NULL }
+};
+AVFILTER_DEFINE_CLASS(pp);
 static av_cold int pp_init(AVFilterContext *ctx, const char *args)
 {
     int i;
     PPFilterContext *pp = ctx->priv;
-    if (!args || !*args)
-        args = "de";
     for (i = 0; i <= PP_QUALITY_MAX; i++) {
-        pp->modes[i] = pp_get_mode_by_name_and_quality(args, i);
+        pp->modes[i] = pp_get_mode_by_name_and_quality(pp->subfilters, i);
         if (!pp->modes[i])
             return AVERROR_EXTERNAL;
     }
     .inputs          = pp_inputs,
     .outputs         = pp_outputs,
     .process_command = pp_process_command,
+    .priv_class      = &pp_class,
 };

libavfilter/vf_subtitles.c+0−4

     { NULL }
 };
-static const char *const shorthand[] = { "filename", NULL };
 #if CONFIG_ASS_FILTER
 static const AVOption ass_options[] = {
     .inputs        = ass_inputs,
     .outputs       = ass_outputs,
     .priv_class    = &ass_class,
-    .shorthand     = shorthand,
 };
 #endif
     .inputs        = ass_inputs,
     .outputs       = ass_outputs,
     .priv_class    = &subtitles_class,
-    .shorthand     = shorthand,
 };
 #endif

libavfilter/vf_thumbnail.c+0−3

     { NULL }
 };
-static const char *const shorthand[] = { "n", NULL };
 AVFilter avfilter_vf_thumbnail = {
     .name          = "thumbnail",
     .description   = NULL_IF_CONFIG_SMALL("Select the most representative frame in a given sequence of consecutive frames."),
     .inputs        = thumbnail_inputs,
     .outputs       = thumbnail_outputs,
     .priv_class    = &thumbnail_class,
-    .shorthand     = shorthand,
 };

libpostproc/postprocess.c+1−1

@@ -666,7 +666,7 @@ pp_mode pp_get_mode_by_name_and_quality(const char name, int quality) · 665 unmodified lines
666	char temp[GET_MODE_BUFFER_SIZE];	666	char temp[GET_MODE_BUFFER_SIZE];
667	char *p= temp;	667	char *p= temp;
668	static const char filterDelimiters[] = ",/";	668	static const char filterDelimiters[] = ",/";
669	static const char optionDelimiters[] = ":";	669	static const char optionDelimiters[] = ":\|";
670	struct PPMode *ppMode;	670	struct PPMode *ppMode;
671	char *filterToken;	671	char *filterToken;
672		672

libpostproc/version.h+1−1

@@ -29,7 +29,7 @@ · 28 unmodified lines
29	#include "libavutil/avutil.h"	29	#include "libavutil/avutil.h"
30		30
31	#define LIBPOSTPROC_VERSION_MAJOR 52	31	#define LIBPOSTPROC_VERSION_MAJOR 52
32	#define LIBPOSTPROC_VERSION_MINOR 2	32	#define LIBPOSTPROC_VERSION_MINOR 3
33	#define LIBPOSTPROC_VERSION_MICRO 100	33	#define LIBPOSTPROC_VERSION_MICRO 100
34		34
35	#define LIBPOSTPROC_VERSION_INT AV_VERSION_INT(LIBPOSTPROC_VERSION_MAJOR, \	35	#define LIBPOSTPROC_VERSION_INT AV_VERSION_INT(LIBPOSTPROC_VERSION_MAJOR, \

tests/lavfi-regression.sh+2−2

@@ -52,8 +52,8 @@ do_lavfi "overlay_yuv420" "split[m],scale=88:72,pad=96:80:4:4[o2];[m]fifo[o1 · 51 unmodified lines
52	do_lavfi "overlay_yuv444" "split[m],scale=88:72,pad=96:80:4:4[o2];[m]fifo[o1],[o1][o2]overlay=240:16:format=yuv444"	52	do_lavfi "overlay_yuv444" "split[m],scale=88:72,pad=96:80:4:4[o2];[m]fifo[o1],[o1][o2]overlay=240:16:format=yuv444"
53	do_lavfi "pad" "pad=iw1.5:ih1.5:iw0.3:ih0.2"	53	do_lavfi "pad" "pad=iw1.5:ih1.5:iw0.3:ih0.2"
54	do_lavfi "pp" "pp=be/hb/vb/tn/l5/al"	54	do_lavfi "pp" "pp=be/hb/vb/tn/l5/al"
55	do_lavfi "pp2" "pp=be/fq:16/h1/v1/lb"	55	do_lavfi "pp2" "pp=be/fq\|16/h1/v1/lb"
56	do_lavfi "pp3" "pp=be/fq:8/ha:128:7/va/li"	56	do_lavfi "pp3" "pp=be/fq\|8/ha\|128\|7/va/li"
57	do_lavfi "pp4" "pp=be/ci"	57	do_lavfi "pp4" "pp=be/ci"
58	do_lavfi "pp5" "pp=md"	58	do_lavfi "pp5" "pp=md"
59	do_lavfi "pp6" "pp=be/fd"	59	do_lavfi "pp6" "pp=be/fd"

Merge remote-tracking branch 'ubitux/shorthand-cleanup'

Keyboard shortcuts

General

Issues and pull requests

Issues, pull requests and Inbox

Repository code