Also avoid using the avfilter-prefix for static objects.
Unified · Split
| @@ -127,6 +127,14 @@ static int get_aspect_ratio(AVFilterLink *inlink, AVRational *aspect_ratio) · 126 unmodified lines | ||
| 127 | 127 | return 0; |
| 128 | 128 | } |
| 129 | 129 | |
| 130 | +static const AVFilterPad aspect_inputs[] = { | |
| 131 | + { | |
| 132 | + .name = "default", | |
| 133 | + .type = AVMEDIA_TYPE_VIDEO, | |
| 134 | + .filter_frame = filter_frame, | |
| 135 | + }, | |
| 136 | +}; | |
| 137 | + | |
| 130 | 138 | #if CONFIG_SETDAR_FILTER |
| 131 | 139 | |
| 132 | 140 | static int setdar_config_props(AVFilterLink *outlink) |
| @@ -171,14 +179,6 @@ static const AVOption setdar_options[] = { · 38 unmodified lines | ||
| 171 | 179 | |
| 172 | 180 | AVFILTER_DEFINE_CLASS(setdar); |
| 173 | 181 | |
| 174 | −static const AVFilterPad avfilter_vf_setdar_inputs[] = { | |
| 175 | − { | |
| 176 | − .name = "default", | |
| 177 | − .type = AVMEDIA_TYPE_VIDEO, | |
| 178 | − .filter_frame = filter_frame, | |
| 179 | − }, | |
| 180 | −}; | |
| 181 | − | |
| 182 | 182 | static const AVFilterPad avfilter_vf_setdar_outputs[] = { |
| 183 | 183 | { |
| 184 | 184 | .name = "default", |
| @@ -193,7 +193,7 @@ const AVFilter ff_vf_setdar = { · 8 unmodified lines | ||
| 193 | 193 | .priv_size = sizeof(AspectContext), |
| 194 | 194 | .priv_class = &setdar_class, |
| 195 | 195 | .flags = AVFILTER_FLAG_METADATA_ONLY, |
| 196 | − FILTER_INPUTS(avfilter_vf_setdar_inputs), | |
| 196 | + FILTER_INPUTS(aspect_inputs), | |
| 197 | 197 | FILTER_OUTPUTS(avfilter_vf_setdar_outputs), |
| 198 | 198 | }; |
| 199 | 199 | |
| @@ -234,14 +234,6 @@ static const AVOption setsar_options[] = { · 34 unmodified lines | ||
| 234 | 234 | |
| 235 | 235 | AVFILTER_DEFINE_CLASS(setsar); |
| 236 | 236 | |
| 237 | −static const AVFilterPad avfilter_vf_setsar_inputs[] = { | |
| 238 | − { | |
| 239 | − .name = "default", | |
| 240 | − .type = AVMEDIA_TYPE_VIDEO, | |
| 241 | − .filter_frame = filter_frame, | |
| 242 | − }, | |
| 243 | −}; | |
| 244 | − | |
| 245 | 237 | static const AVFilterPad avfilter_vf_setsar_outputs[] = { |
| 246 | 238 | { |
| 247 | 239 | .name = "default", |
| @@ -256,7 +248,7 @@ const AVFilter ff_vf_setsar = { · 8 unmodified lines | ||
| 256 | 248 | .priv_size = sizeof(AspectContext), |
| 257 | 249 | .priv_class = &setsar_class, |
| 258 | 250 | .flags = AVFILTER_FLAG_METADATA_ONLY, |
| 259 | − FILTER_INPUTS(avfilter_vf_setsar_inputs), | |
| 251 | + FILTER_INPUTS(aspect_inputs), | |
| 260 | 252 | FILTER_OUTPUTS(avfilter_vf_setsar_outputs), |
| 261 | 253 | }; |
| 262 | 254 | |