ffmpeg | branch: master | Michael Niedermayer <michae...@gmx.at> | Thu May 28 01:38:15 2015 +0200| [03637762d94cdd47b06c6311c8116edf9de73256] | committer: Michael Niedermayer
avfilter/vf_fade: Force alpha pixel format if alpha is set to 1 Fixes Ticket4321 Signed-off-by: Michael Niedermayer <michae...@gmx.at> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=03637762d94cdd47b06c6311c8116edf9de73256 --- libavfilter/vf_fade.c | 26 ++++++++++++++++++++++---- 1 file changed, 22 insertions(+), 4 deletions(-) diff --git a/libavfilter/vf_fade.c b/libavfilter/vf_fade.c index ab2dccf..3e6aa7f 100644 --- a/libavfilter/vf_fade.c +++ b/libavfilter/vf_fade.c @@ -115,12 +115,30 @@ static int query_formats(AVFilterContext *ctx) AV_PIX_FMT_RGBA, AV_PIX_FMT_BGRA, AV_PIX_FMT_NONE }; + static const enum AVPixelFormat pix_fmts_alpha[] = { + AV_PIX_FMT_YUVA420P, AV_PIX_FMT_YUVA422P, AV_PIX_FMT_YUVA444P, + AV_PIX_FMT_ARGB, AV_PIX_FMT_ABGR, + AV_PIX_FMT_RGBA, AV_PIX_FMT_BGRA, + AV_PIX_FMT_NONE + }; + static const enum AVPixelFormat pix_fmts_rgba[] = { + AV_PIX_FMT_ARGB, AV_PIX_FMT_ABGR, + AV_PIX_FMT_RGBA, AV_PIX_FMT_BGRA, + AV_PIX_FMT_NONE + }; AVFilterFormats *fmts_list; - if (s->black_fade) - fmts_list = ff_make_format_list(pix_fmts); - else - fmts_list = ff_make_format_list(pix_fmts_rgb); + if (s->alpha) { + if (s->black_fade) + fmts_list = ff_make_format_list(pix_fmts_alpha); + else + fmts_list = ff_make_format_list(pix_fmts_rgba); + } else { + if (s->black_fade) + fmts_list = ff_make_format_list(pix_fmts); + else + fmts_list = ff_make_format_list(pix_fmts_rgb); + } if (!fmts_list) return AVERROR(ENOMEM); return ff_set_common_formats(ctx, fmts_list); _______________________________________________ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
