* commit 'b5a138652ff8a5b987d3e1191e67fd9f6575527e': Give less generic names to global library option arrays Conflicts: libavcodec/options_table.h libavfilter/avfilter.c libavformat/options_table.h libswscale/options.c
Showing the changes to libavfilter/avfilter.c (1 of 9 files). Show all
Unified · Split
| @@ -539,7 +539,7 @@ static const AVClass *filter_child_class_next(const AVClass *prev) · 538 unmodified lines | |||
| 539 | 539 | ||
| 540 | #define OFFSET(x) offsetof(AVFilterContext, x) | 540 | #define OFFSET(x) offsetof(AVFilterContext, x) |
| 541 | #define FLAGS AV_OPT_FLAG_FILTERING_PARAM | 541 | #define FLAGS AV_OPT_FLAG_FILTERING_PARAM |
| 542 | static const AVOption options[] = { | 542 | static const AVOption avfilter_options[] = { |
| 543 | { "thread_type", "Allowed thread types", OFFSET(thread_type), AV_OPT_TYPE_FLAGS, | 543 | { "thread_type", "Allowed thread types", OFFSET(thread_type), AV_OPT_TYPE_FLAGS, |
| 544 | { .i64 = AVFILTER_THREAD_SLICE }, 0, INT_MAX, FLAGS, "thread_type" }, | 544 | { .i64 = AVFILTER_THREAD_SLICE }, 0, INT_MAX, FLAGS, "thread_type" }, |
| 545 | { "slice", NULL, 0, AV_OPT_TYPE_CONST, { .i64 = AVFILTER_THREAD_SLICE }, .unit = "thread_type" }, | 545 | { "slice", NULL, 0, AV_OPT_TYPE_CONST, { .i64 = AVFILTER_THREAD_SLICE }, .unit = "thread_type" }, |
| @@ -554,7 +554,7 @@ static const AVClass avfilter_class = { · 8 unmodified lines | |||
| 554 | .category = AV_CLASS_CATEGORY_FILTER, | 554 | .category = AV_CLASS_CATEGORY_FILTER, |
| 555 | .child_next = filter_child_next, | 555 | .child_next = filter_child_next, |
| 556 | .child_class_next = filter_child_class_next, | 556 | .child_class_next = filter_child_class_next, |
| 557 | .option = options, | 557 | .option = avfilter_options, |
| 558 | }; | 558 | }; |
| 559 | 559 | ||
| 560 | static int default_execute(AVFilterContext *ctx, action_func *func, void *arg, | 560 | static int default_execute(AVFilterContext *ctx, action_func *func, void *arg, |