Unified · Split
| @@ -44,8 +44,6 @@ typedef struct CropDetectContext { · 43 unmodified lines | |||
| 44 | int max_outliers; | 44 | int max_outliers; |
| 45 | } CropDetectContext; | 45 | } CropDetectContext; |
| 46 | 46 | ||
| 47 | static int query_formats(AVFilterContext *ctx) | ||
| 48 | { | ||
| 49 | static const enum AVPixelFormat pix_fmts[] = { | 47 | static const enum AVPixelFormat pix_fmts[] = { |
| 50 | AV_PIX_FMT_YUV420P, AV_PIX_FMT_YUVJ420P, | 48 | AV_PIX_FMT_YUV420P, AV_PIX_FMT_YUVJ420P, |
| 51 | AV_PIX_FMT_YUV422P, AV_PIX_FMT_YUVJ422P, | 49 | AV_PIX_FMT_YUV422P, AV_PIX_FMT_YUVJ422P, |
| @@ -63,9 +61,6 @@ static int query_formats(AVFilterContext *ctx) · 11 unmodified lines | |||
| 63 | AV_PIX_FMT_NONE | 61 | AV_PIX_FMT_NONE |
| 64 | }; | 62 | }; |
| 65 | 63 | ||
| 66 | return ff_set_common_formats_from_list(ctx, pix_fmts); | ||
| 67 | } | ||
| 68 | |||
| 69 | static int checkline(void *ctx, const unsigned char *src, int stride, int len, int bpp) | 64 | static int checkline(void *ctx, const unsigned char *src, int stride, int len, int bpp) |
| 70 | { | 65 | { |
| 71 | int total = 0; | 66 | int total = 0; |
| @@ -277,6 +272,6 @@ const AVFilter ff_vf_cropdetect = { · 205 unmodified lines | |||
| 277 | .init = init, | 272 | .init = init, |
| 278 | FILTER_INPUTS(avfilter_vf_cropdetect_inputs), | 273 | FILTER_INPUTS(avfilter_vf_cropdetect_inputs), |
| 279 | FILTER_OUTPUTS(avfilter_vf_cropdetect_outputs), | 274 | FILTER_OUTPUTS(avfilter_vf_cropdetect_outputs), |
| 280 | FILTER_QUERY_FUNC(query_formats), | 275 | FILTER_PIXFMTS_ARRAY(pix_fmts), |
| 281 | .flags = AVFILTER_FLAG_SUPPORT_TIMELINE_GENERIC, | 276 | .flags = AVFILTER_FLAG_SUPPORT_TIMELINE_GENERIC, |
| 282 | }; | 277 | }; |