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.
This commit is contained in:
Anton Khirnov
2012-03-23 15:46:30 +01:00
parent 7af99a01c4
commit b7327887ea
5 changed files with 40 additions and 56 deletions

View File

@ -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;
}