Unified · Split
| @@ -60,8 +60,7 @@ static const AVOption options[] = { · 59 unmodified lines | |||
| 60 | { NULL } | 60 | { NULL } |
| 61 | }; | 61 | }; |
| 62 | 62 | ||
| 63 | #define premultiply_options options | 63 | AVFILTER_DEFINE_CLASS_EXT(premultiply, "(un)premultiply", options); |
| 64 | AVFILTER_DEFINE_CLASS(premultiply); | ||
| 65 | 64 | ||
| 66 | static int query_formats(AVFilterContext *ctx) | 65 | static int query_formats(AVFilterContext *ctx) |
| 67 | { | 66 | { |
| @@ -843,12 +842,10 @@ const AVFilter ff_vf_premultiply = { · 775 unmodified lines | |||
| 843 | 842 | ||
| 844 | #if CONFIG_UNPREMULTIPLY_FILTER | 843 | #if CONFIG_UNPREMULTIPLY_FILTER |
| 845 | 844 | ||
| 846 | #define unpremultiply_options options | ||
| 847 | AVFILTER_DEFINE_CLASS(unpremultiply); | ||
| 848 | |||
| 849 | const AVFilter ff_vf_unpremultiply = { | 845 | const AVFilter ff_vf_unpremultiply = { |
| 850 | .name = "unpremultiply", | 846 | .name = "unpremultiply", |
| 851 | .description = NULL_IF_CONFIG_SMALL("UnPreMultiply first stream with first plane of second stream."), | 847 | .description = NULL_IF_CONFIG_SMALL("UnPreMultiply first stream with first plane of second stream."), |
| 848 | .priv_class = &premultiply_class, | ||
| 852 | .priv_size = sizeof(PreMultiplyContext), | 849 | .priv_size = sizeof(PreMultiplyContext), |
| 853 | .init = init, | 850 | .init = init, |
| 854 | .uninit = uninit, | 851 | .uninit = uninit, |
| @@ -856,7 +853,6 @@ const AVFilter ff_vf_unpremultiply = { · 1 unmodified line | |||
| 856 | .activate = activate, | 853 | .activate = activate, |
| 857 | .inputs = NULL, | 854 | .inputs = NULL, |
| 858 | FILTER_OUTPUTS(premultiply_outputs), | 855 | FILTER_OUTPUTS(premultiply_outputs), |
| 859 | .priv_class = &unpremultiply_class, | ||
| 860 | .flags = AVFILTER_FLAG_SUPPORT_TIMELINE_INTERNAL | | 856 | .flags = AVFILTER_FLAG_SUPPORT_TIMELINE_INTERNAL | |
| 861 | AVFILTER_FLAG_DYNAMIC_INPUTS | | 857 | AVFILTER_FLAG_DYNAMIC_INPUTS | |
| 862 | AVFILTER_FLAG_SLICE_THREADS, | 858 | AVFILTER_FLAG_SLICE_THREADS, |