From b7327887ea260d26e4fe98d34149cd57168f2ba3 Mon Sep 17 00:00:00 2001 From: Anton Khirnov Date: Fri, 23 Mar 2012 15:46:30 +0100 Subject: avconv: get output pixel format from lavfi. This way we don't require a clearly defined corresponding input stream. The result for the xwd test changes because rgb24 is now chosen instead of bgra. --- cmdutils.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'cmdutils.c') diff --git a/cmdutils.c b/cmdutils.c index 48cfff7ed5..d590d0a49f 100644 --- a/cmdutils.c +++ b/cmdutils.c @@ -1036,9 +1036,11 @@ static void null_end_frame(AVFilterLink *inlink) { } static int sink_query_formats(AVFilterContext *ctx) { SinkContext *priv = ctx->priv; - enum PixelFormat pix_fmts[] = { priv->pix_fmt, PIX_FMT_NONE }; - avfilter_set_common_formats(ctx, avfilter_make_format_list(pix_fmts)); + if (priv->pix_fmts) + avfilter_set_common_formats(ctx, avfilter_make_format_list(priv->pix_fmts)); + else + avfilter_default_query_formats(ctx); return 0; } -- cgit v1.2.3