Unified · Split
| @@ -159,8 +159,6 @@ static av_cold int config_output(AVFilterLink *outlink) · 158 unmodified lines | |||
| 159 | return 0; | 159 | return 0; |
| 160 | } | 160 | } |
| 161 | 161 | ||
| 162 | static av_cold int query_formats(AVFilterContext *avctx) | ||
| 163 | { | ||
| 164 | static const enum AVPixelFormat pixel_fmts[] = { | 162 | static const enum AVPixelFormat pixel_fmts[] = { |
| 165 | AV_PIX_FMT_ARGB, | 163 | AV_PIX_FMT_ARGB, |
| 166 | AV_PIX_FMT_RGBA, | 164 | AV_PIX_FMT_RGBA, |
| @@ -169,9 +167,6 @@ static av_cold int query_formats(AVFilterContext *avctx) · 2 unmodified lines | |||
| 169 | AV_PIX_FMT_NONE | 167 | AV_PIX_FMT_NONE |
| 170 | }; | 168 | }; |
| 171 | 169 | ||
| 172 | return ff_set_common_formats_from_list(avctx, pixel_fmts); | ||
| 173 | } | ||
| 174 | |||
| 175 | static const AVFilterPad colorkey_inputs[] = { | 170 | static const AVFilterPad colorkey_inputs[] = { |
| 176 | { | 171 | { |
| 177 | .name = "default", | 172 | .name = "default", |
| @@ -211,7 +206,7 @@ const AVFilter ff_vf_colorkey = { · 33 unmodified lines | |||
| 211 | .init = init_filter, | 206 | .init = init_filter, |
| 212 | FILTER_INPUTS(colorkey_inputs), | 207 | FILTER_INPUTS(colorkey_inputs), |
| 213 | FILTER_OUTPUTS(colorkey_outputs), | 208 | FILTER_OUTPUTS(colorkey_outputs), |
| 214 | FILTER_QUERY_FUNC(query_formats), | 209 | FILTER_PIXFMTS_ARRAY(pixel_fmts), |
| 215 | .flags = AVFILTER_FLAG_SUPPORT_TIMELINE_GENERIC | AVFILTER_FLAG_SLICE_THREADS, | 210 | .flags = AVFILTER_FLAG_SUPPORT_TIMELINE_GENERIC | AVFILTER_FLAG_SLICE_THREADS, |
| 216 | .process_command = ff_filter_process_command, | 211 | .process_command = ff_filter_process_command, |
| 217 | }; | 212 | }; |
| @@ -236,7 +231,7 @@ const AVFilter ff_vf_colorhold = { · 18 unmodified lines | |||
| 236 | .init = init_filter, | 231 | .init = init_filter, |
| 237 | FILTER_INPUTS(colorkey_inputs), | 232 | FILTER_INPUTS(colorkey_inputs), |
| 238 | FILTER_OUTPUTS(colorkey_outputs), | 233 | FILTER_OUTPUTS(colorkey_outputs), |
| 239 | FILTER_QUERY_FUNC(query_formats), | 234 | FILTER_PIXFMTS_ARRAY(pixel_fmts), |
| 240 | .flags = AVFILTER_FLAG_SUPPORT_TIMELINE_GENERIC | AVFILTER_FLAG_SLICE_THREADS, | 235 | .flags = AVFILTER_FLAG_SUPPORT_TIMELINE_GENERIC | AVFILTER_FLAG_SLICE_THREADS, |
| 241 | .process_command = ff_filter_process_command, | 236 | .process_command = ff_filter_process_command, |
| 242 | }; | 237 | }; |