diff options
Diffstat (limited to 'libavfilter/vf_format.c')
-rw-r--r-- | libavfilter/vf_format.c | 70 |
1 files changed, 31 insertions, 39 deletions
diff --git a/libavfilter/vf_format.c b/libavfilter/vf_format.c index 914089d..96cb7fd 100644 --- a/libavfilter/vf_format.c +++ b/libavfilter/vf_format.c @@ -1,20 +1,20 @@ /* * Copyright (c) 2007 Bobby Bingham * - * This file is part of Libav. + * This file is part of FFmpeg. * - * Libav is free software; you can redistribute it and/or + * FFmpeg is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either * version 2.1 of the License, or (at your option) any later version. * - * Libav is distributed in the hope that it will be useful, + * FFmpeg is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with Libav; if not, write to the Free Software + * License along with FFmpeg; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ @@ -58,6 +58,7 @@ static av_cold int init(AVFilterContext *ctx) char *cur, *sep; int nb_formats = 1; int i; + int ret; if (!s->pix_fmts) { av_log(ctx, AV_LOG_ERROR, "Empty output format string.\n"); @@ -83,11 +84,8 @@ static av_cold int init(AVFilterContext *ctx) if (sep) *sep++ = 0; - s->formats[i] = av_get_pix_fmt(cur); - if (s->formats[i] == AV_PIX_FMT_NONE) { - av_log(ctx, AV_LOG_ERROR, "Unknown pixel format: %s\n", cur); - return AVERROR(EINVAL); - } + if ((ret = ff_parse_pixel_format(&s->formats[i], cur, ctx)) < 0) + return ret; cur = sep; } @@ -96,7 +94,7 @@ static av_cold int init(AVFilterContext *ctx) if (!strcmp(ctx->filter->name, "noformat")) { const AVPixFmtDescriptor *desc = NULL; enum AVPixelFormat *formats_allowed; - int nb_formats_lavu = 0, nb_formats_allowed = 0;; + int nb_formats_lavu = 0, nb_formats_allowed = 0; /* count the formats known to lavu */ while ((desc = av_pix_fmt_desc_next(desc))) @@ -144,16 +142,13 @@ static int query_formats(AVFilterContext *ctx) #define OFFSET(x) offsetof(FormatContext, x) static const AVOption options[] = { { "pix_fmts", "A '|'-separated list of pixel formats", OFFSET(pix_fmts), AV_OPT_TYPE_STRING, .flags = AV_OPT_FLAG_VIDEO_PARAM }, - { NULL }, + { NULL } }; #if CONFIG_FORMAT_FILTER -static const AVClass format_class = { - .class_name = "format", - .item_name = av_default_item_name, - .option = options, - .version = LIBAVUTIL_VERSION_INT, -}; + +#define format_options options +AVFILTER_DEFINE_CLASS(format); static const AVFilterPad avfilter_vf_format_inputs[] = { { @@ -173,29 +168,26 @@ static const AVFilterPad avfilter_vf_format_outputs[] = { }; AVFilter ff_vf_format = { - .name = "format", - .description = NULL_IF_CONFIG_SMALL("Convert the input video to one of the specified pixel formats."), + .name = "format", + .description = NULL_IF_CONFIG_SMALL("Convert the input video to one of the specified pixel formats."), - .init = init, - .uninit = uninit, + .init = init, + .uninit = uninit, .query_formats = query_formats, - .priv_size = sizeof(FormatContext), - .priv_class = &format_class, + .priv_size = sizeof(FormatContext), + .priv_class = &format_class, - .inputs = avfilter_vf_format_inputs, - .outputs = avfilter_vf_format_outputs, + .inputs = avfilter_vf_format_inputs, + .outputs = avfilter_vf_format_outputs, }; #endif /* CONFIG_FORMAT_FILTER */ #if CONFIG_NOFORMAT_FILTER -static const AVClass noformat_class = { - .class_name = "noformat", - .item_name = av_default_item_name, - .option = options, - .version = LIBAVUTIL_VERSION_INT, -}; + +#define noformat_options options +AVFILTER_DEFINE_CLASS(noformat); static const AVFilterPad avfilter_vf_noformat_inputs[] = { { @@ -215,18 +207,18 @@ static const AVFilterPad avfilter_vf_noformat_outputs[] = { }; AVFilter ff_vf_noformat = { - .name = "noformat", - .description = NULL_IF_CONFIG_SMALL("Force libavfilter not to use any of the specified pixel formats for the input to the next filter."), + .name = "noformat", + .description = NULL_IF_CONFIG_SMALL("Force libavfilter not to use any of the specified pixel formats for the input to the next filter."), - .init = init, - .uninit = uninit, + .init = init, + .uninit = uninit, .query_formats = query_formats, - .priv_size = sizeof(FormatContext), - .priv_class = &noformat_class, + .priv_size = sizeof(FormatContext), + .priv_class = &noformat_class, - .inputs = avfilter_vf_noformat_inputs, - .outputs = avfilter_vf_noformat_outputs, + .inputs = avfilter_vf_noformat_inputs, + .outputs = avfilter_vf_noformat_outputs, }; #endif /* CONFIG_NOFORMAT_FILTER */ |