Unified · Split
| @@ -53,8 +53,6 @@ static const AVOption entropy_options[] = { · 52 unmodified lines | |||
| 53 | 53 | ||
| 54 | AVFILTER_DEFINE_CLASS(entropy); | 54 | AVFILTER_DEFINE_CLASS(entropy); |
| 55 | 55 | ||
| 56 | static int query_formats(AVFilterContext *ctx) | ||
| 57 | { | ||
| 58 | static const enum AVPixelFormat pixfmts[] = { | 56 | static const enum AVPixelFormat pixfmts[] = { |
| 59 | AV_PIX_FMT_YUV444P, AV_PIX_FMT_YUV422P, AV_PIX_FMT_YUV420P, AV_PIX_FMT_YUV411P, | 57 | AV_PIX_FMT_YUV444P, AV_PIX_FMT_YUV422P, AV_PIX_FMT_YUV420P, AV_PIX_FMT_YUV411P, |
| 60 | AV_PIX_FMT_YUV440P, | 58 | AV_PIX_FMT_YUV440P, |
| @@ -73,9 +71,6 @@ static int query_formats(AVFilterContext *ctx) · 12 unmodified lines | |||
| 73 | AV_PIX_FMT_NONE | 71 | AV_PIX_FMT_NONE |
| 74 | }; | 72 | }; |
| 75 | 73 | ||
| 76 | return ff_set_common_formats_from_list(ctx, pixfmts); | ||
| 77 | } | ||
| 78 | |||
| 79 | static int config_input(AVFilterLink *inlink) | 74 | static int config_input(AVFilterLink *inlink) |
| 80 | { | 75 | { |
| 81 | const AVPixFmtDescriptor *desc = av_pix_fmt_desc_get(inlink->format); | 76 | const AVPixFmtDescriptor *desc = av_pix_fmt_desc_get(inlink->format); |
| @@ -195,7 +190,7 @@ const AVFilter ff_vf_entropy = { · 113 unmodified lines | |||
| 195 | .uninit = uninit, | 190 | .uninit = uninit, |
| 196 | FILTER_INPUTS(inputs), | 191 | FILTER_INPUTS(inputs), |
| 197 | FILTER_OUTPUTS(outputs), | 192 | FILTER_OUTPUTS(outputs), |
| 198 | FILTER_QUERY_FUNC(query_formats), | 193 | FILTER_PIXFMTS_ARRAY(pixfmts), |
| 199 | .priv_class = &entropy_class, | 194 | .priv_class = &entropy_class, |
| 200 | .flags = AVFILTER_FLAG_SUPPORT_TIMELINE_GENERIC, | 195 | .flags = AVFILTER_FLAG_SUPPORT_TIMELINE_GENERIC, |
| 201 | }; | 196 | }; |