Unified · Split
| @@ -44,8 +44,6 @@ static const AVOption removegrain_options[] = { · 43 unmodified lines | |||
| 44 | 44 | ||
| 45 | AVFILTER_DEFINE_CLASS(removegrain); | 45 | AVFILTER_DEFINE_CLASS(removegrain); |
| 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_GRAY8, | 48 | AV_PIX_FMT_GRAY8, |
| 51 | AV_PIX_FMT_YUV420P, AV_PIX_FMT_YUV422P, AV_PIX_FMT_YUV444P, | 49 | AV_PIX_FMT_YUV420P, AV_PIX_FMT_YUV422P, AV_PIX_FMT_YUV444P, |
| @@ -57,9 +55,6 @@ static int query_formats(AVFilterContext *ctx) · 5 unmodified lines | |||
| 57 | AV_PIX_FMT_NONE | 55 | AV_PIX_FMT_NONE |
| 58 | }; | 56 | }; |
| 59 | 57 | ||
| 60 | return ff_set_common_formats_from_list(ctx, pix_fmts); | ||
| 61 | } | ||
| 62 | |||
| 63 | #define REMOVE_GRAIN_SORT_AXIS \ | 58 | #define REMOVE_GRAIN_SORT_AXIS \ |
| 64 | const int ma1 = FFMAX(a1, a8); \ | 59 | const int ma1 = FFMAX(a1, a8); \ |
| 65 | const int mi1 = FFMIN(a1, a8); \ | 60 | const int mi1 = FFMIN(a1, a8); \ |
| @@ -649,7 +644,7 @@ const AVFilter ff_vf_removegrain = { · 583 unmodified lines | |||
| 649 | .priv_size = sizeof(RemoveGrainContext), | 644 | .priv_size = sizeof(RemoveGrainContext), |
| 650 | FILTER_INPUTS(removegrain_inputs), | 645 | FILTER_INPUTS(removegrain_inputs), |
| 651 | FILTER_OUTPUTS(removegrain_outputs), | 646 | FILTER_OUTPUTS(removegrain_outputs), |
| 652 | FILTER_QUERY_FUNC(query_formats), | 647 | FILTER_PIXFMTS_ARRAY(pix_fmts), |
| 653 | .priv_class = &removegrain_class, | 648 | .priv_class = &removegrain_class, |
| 654 | .flags = AVFILTER_FLAG_SUPPORT_TIMELINE_GENERIC | AVFILTER_FLAG_SLICE_THREADS, | 649 | .flags = AVFILTER_FLAG_SUPPORT_TIMELINE_GENERIC | AVFILTER_FLAG_SLICE_THREADS, |
| 655 | }; | 650 | }; |