Unified · Split
| @@ -1147,8 +1147,6 @@ static int set_identity_matrix(AVFilterContext *ctx, int size) · 1146 unmodified lines | |||
| 1147 | return 0; | 1147 | return 0; |
| 1148 | } | 1148 | } |
| 1149 | 1149 | ||
| 1150 | static int query_formats(AVFilterContext *ctx) | ||
| 1151 | { | ||
| 1152 | static const enum AVPixelFormat pix_fmts[] = { | 1150 | static const enum AVPixelFormat pix_fmts[] = { |
| 1153 | AV_PIX_FMT_RGB24, AV_PIX_FMT_BGR24, | 1151 | AV_PIX_FMT_RGB24, AV_PIX_FMT_BGR24, |
| 1154 | AV_PIX_FMT_RGBA, AV_PIX_FMT_BGRA, | 1152 | AV_PIX_FMT_RGBA, AV_PIX_FMT_BGRA, |
| @@ -1166,8 +1164,6 @@ static int query_formats(AVFilterContext *ctx) · 11 unmodified lines | |||
| 1166 | AV_PIX_FMT_GBRPF32, AV_PIX_FMT_GBRAPF32, | 1164 | AV_PIX_FMT_GBRPF32, AV_PIX_FMT_GBRAPF32, |
| 1167 | AV_PIX_FMT_NONE | 1165 | AV_PIX_FMT_NONE |
| 1168 | }; | 1166 | }; |
| 1169 | return ff_set_common_formats_from_list(ctx, pix_fmts); | ||
| 1170 | } | ||
| 1171 | 1167 | ||
| 1172 | static int config_input(AVFilterLink *inlink) | 1168 | static int config_input(AVFilterLink *inlink) |
| 1173 | { | 1169 | { |
| @@ -1366,7 +1362,7 @@ const AVFilter ff_vf_lut3d = { · 192 unmodified lines | |||
| 1366 | .uninit = lut3d_uninit, | 1362 | .uninit = lut3d_uninit, |
| 1367 | FILTER_INPUTS(lut3d_inputs), | 1363 | FILTER_INPUTS(lut3d_inputs), |
| 1368 | FILTER_OUTPUTS(lut3d_outputs), | 1364 | FILTER_OUTPUTS(lut3d_outputs), |
| 1369 | FILTER_QUERY_FUNC(query_formats), | 1365 | FILTER_PIXFMTS_ARRAY(pix_fmts), |
| 1370 | .priv_class = &lut3d_class, | 1366 | .priv_class = &lut3d_class, |
| 1371 | .flags = AVFILTER_FLAG_SUPPORT_TIMELINE_GENERIC | AVFILTER_FLAG_SLICE_THREADS, | 1367 | .flags = AVFILTER_FLAG_SUPPORT_TIMELINE_GENERIC | AVFILTER_FLAG_SLICE_THREADS, |
| 1372 | .process_command = process_command, | 1368 | .process_command = process_command, |
| @@ -1630,7 +1626,7 @@ const AVFilter ff_vf_haldclut = { · 257 unmodified lines | |||
| 1630 | .activate = activate, | 1626 | .activate = activate, |
| 1631 | FILTER_INPUTS(haldclut_inputs), | 1627 | FILTER_INPUTS(haldclut_inputs), |
| 1632 | FILTER_OUTPUTS(haldclut_outputs), | 1628 | FILTER_OUTPUTS(haldclut_outputs), |
| 1633 | FILTER_QUERY_FUNC(query_formats), | 1629 | FILTER_PIXFMTS_ARRAY(pix_fmts), |
| 1634 | .priv_class = &haldclut_class, | 1630 | .priv_class = &haldclut_class, |
| 1635 | .flags = AVFILTER_FLAG_SUPPORT_TIMELINE_INTERNAL | AVFILTER_FLAG_SLICE_THREADS, | 1631 | .flags = AVFILTER_FLAG_SUPPORT_TIMELINE_INTERNAL | AVFILTER_FLAG_SLICE_THREADS, |
| 1636 | .process_command = process_command, | 1632 | .process_command = process_command, |
| @@ -2293,7 +2289,7 @@ const AVFilter ff_vf_lut1d = { · 656 unmodified lines | |||
| 2293 | .init = lut1d_init, | 2289 | .init = lut1d_init, |
| 2294 | FILTER_INPUTS(lut1d_inputs), | 2290 | FILTER_INPUTS(lut1d_inputs), |
| 2295 | FILTER_OUTPUTS(lut1d_outputs), | 2291 | FILTER_OUTPUTS(lut1d_outputs), |
| 2296 | FILTER_QUERY_FUNC(query_formats), | 2292 | FILTER_PIXFMTS_ARRAY(pix_fmts), |
| 2297 | .priv_class = &lut1d_class, | 2293 | .priv_class = &lut1d_class, |
| 2298 | .flags = AVFILTER_FLAG_SUPPORT_TIMELINE_GENERIC | AVFILTER_FLAG_SLICE_THREADS, | 2294 | .flags = AVFILTER_FLAG_SUPPORT_TIMELINE_GENERIC | AVFILTER_FLAG_SLICE_THREADS, |
| 2299 | .process_command = lut1d_process_command, | 2295 | .process_command = lut1d_process_command, |