lavfi/edgedetect: switch to an AVOptions-based system.

Clément Bœsch committed 13 years ago

Commit 1cdb9f41 parent 34610e13 files · +2 −8Browse files

Unified · Split

3 files

@@ -3008,7 +3008,7 @@ For more information about fontconfig, check: · 3007 unmodified lines
3008		3008
3009	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.
3010		3010
3011	This filter accepts the following optional named parameters:	3011	The filter accepts the following options:
3012		3012
3013	@table @option	3013	@table @option
3014	@item low, high	3014	@item low, high

@@ -667,6 +667,7 @@ int avfilter_init_filter(AVFilterContext filter, const char args, void *opaque · 666 unmodified lines
667	!strcmp(filter->filter->name, "drawbox" ) \|\|	667	!strcmp(filter->filter->name, "drawbox" ) \|\|
668	!strcmp(filter->filter->name, "drawtext" ) \|\|	668	!strcmp(filter->filter->name, "drawtext" ) \|\|
669	!strcmp(filter->filter->name, "ebur128" ) \|\|	669	!strcmp(filter->filter->name, "ebur128" ) \|\|
		670	!strcmp(filter->filter->name, "edgedetect") \|\|
670	!strcmp(filter->filter->name, "fade" ) \|\|	671	!strcmp(filter->filter->name, "fade" ) \|\|
671	!strcmp(filter->filter->name, "fieldorder") \|\|	672	!strcmp(filter->filter->name, "fieldorder") \|\|
672	!strcmp(filter->filter->name, "fps" ) \|\|	673	!strcmp(filter->filter->name, "fps" ) \|\|

 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;

@@ -667,6 +667,7 @@ int avfilter_init_filter(AVFilterContext filter, const char args, void *opaque · 666 unmodified lines
667	!strcmp(filter->filter->name, "drawbox" ) \|\|	667	!strcmp(filter->filter->name, "drawbox" ) \|\|
668	!strcmp(filter->filter->name, "drawtext" ) \|\|	668	!strcmp(filter->filter->name, "drawtext" ) \|\|
669	!strcmp(filter->filter->name, "ebur128" ) \|\|	669	!strcmp(filter->filter->name, "ebur128" ) \|\|
		670	!strcmp(filter->filter->name, "edgedetect") \|\|
670	!strcmp(filter->filter->name, "fade" ) \|\|	671	!strcmp(filter->filter->name, "fade" ) \|\|
671	!strcmp(filter->filter->name, "fieldorder") \|\|	672	!strcmp(filter->filter->name, "fieldorder") \|\|
672	!strcmp(filter->filter->name, "fps" ) \|\|	673	!strcmp(filter->filter->name, "fps" ) \|\|

Keyboard shortcuts