Showing the changes to libavfilter (1 of 1 file). Show all
Unified · Split
| @@ -71,23 +71,6 @@ static int config_input(AVFilterLink *inlink) · 70 unmodified lines | ||
| 71 | 71 | return 0; |
| 72 | 72 | } |
| 73 | 73 | |
| 74 | −static int query_formats(AVFilterContext *ctx) | |
| 75 | −{ | |
| 76 | − static const enum AVPixelFormat pix_fmts[] = { | |
| 77 | − AV_PIX_FMT_GRAY8, | |
| 78 | − AV_PIX_FMT_YUV410P, AV_PIX_FMT_YUV411P, | |
| 79 | − AV_PIX_FMT_YUV420P, AV_PIX_FMT_YUV422P, | |
| 80 | − AV_PIX_FMT_YUV440P, AV_PIX_FMT_YUV444P, | |
| 81 | − AV_PIX_FMT_NV12, AV_PIX_FMT_NV21, | |
| 82 | − AV_PIX_FMT_YUVJ411P, AV_PIX_FMT_YUVJ420P, | |
| 83 | − AV_PIX_FMT_YUVJ422P, AV_PIX_FMT_YUVJ444P, | |
| 84 | − AV_PIX_FMT_YUVJ440P, | |
| 85 | − AV_PIX_FMT_NONE | |
| 86 | − }; | |
| 87 | − | |
| 88 | − return ff_set_common_formats_from_list(ctx, pix_fmts); | |
| 89 | −} | |
| 90 | − | |
| 91 | 74 | static int filter_frame(AVFilterLink *inlink, AVFrame *frame) |
| 92 | 75 | { |
| 93 | 76 | FilterLink *inl = ff_filter_link(inlink); |
| @@ -154,6 +137,18 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *frame) · 60 unmodified lines | ||
| 154 | 137 | return ff_filter_frame(outlink, frame); |
| 155 | 138 | } |
| 156 | 139 | |
| 140 | +static const enum AVPixelFormat pix_fmts[] = { | |
| 141 | + AV_PIX_FMT_GRAY8, | |
| 142 | + AV_PIX_FMT_YUV410P, AV_PIX_FMT_YUV411P, | |
| 143 | + AV_PIX_FMT_YUV420P, AV_PIX_FMT_YUV422P, | |
| 144 | + AV_PIX_FMT_YUV440P, AV_PIX_FMT_YUV444P, | |
| 145 | + AV_PIX_FMT_NV12, AV_PIX_FMT_NV21, | |
| 146 | + AV_PIX_FMT_YUVJ411P, AV_PIX_FMT_YUVJ420P, | |
| 147 | + AV_PIX_FMT_YUVJ422P, AV_PIX_FMT_YUVJ444P, | |
| 148 | + AV_PIX_FMT_YUVJ440P, | |
| 149 | + AV_PIX_FMT_NONE | |
| 150 | +}; | |
| 151 | + | |
| 157 | 152 | static const AVClass quirc_class = { |
| 158 | 153 | .class_name = "quirc", |
| 159 | 154 | .version = LIBAVUTIL_VERSION_INT, |
| @@ -178,7 +173,7 @@ const AVFilter ff_vf_quirc = { · 18 unmodified lines | ||
| 178 | 173 | .uninit = uninit, |
| 179 | 174 | FILTER_INPUTS(inputs), |
| 180 | 175 | FILTER_OUTPUTS(ff_video_default_filterpad), |
| 181 | − FILTER_QUERY_FUNC(query_formats), | |
| 176 | + FILTER_PIXFMTS_ARRAY(pix_fmts), | |
| 182 | 177 | .flags = AVFILTER_FLAG_SUPPORT_TIMELINE_GENERIC | |
| 183 | 178 | AVFILTER_FLAG_METADATA_ONLY, |
| 184 | 179 | }; |