highperfocused/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

avfilter/vf_fade: Force alpha pixel format if alpha is set to 1

Browse Source 
Fixes Ticket4321

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer
2015-05-28 01:38:15 +02:00
parent 11aa050a25
commit 03637762d9
1 changed files with 22 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
libavfilter/vf_fade.c
View File

@@ -115,12 +115,30 @@ static int query_formats(AVFilterContext *ctx)
AV_PIX_FMT_RGBA, AV_PIX_FMT_BGRA, AV_PIX_FMT_RGBA, AV_PIX_FMT_BGRA,
AV_PIX_FMT_NONE 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; AVFilterFormats *fmts_list;
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) if (s->black_fade)
fmts_list = ff_make_format_list(pix_fmts); fmts_list = ff_make_format_list(pix_fmts);
else else
fmts_list = ff_make_format_list(pix_fmts_rgb); fmts_list = ff_make_format_list(pix_fmts_rgb);
}
if (!fmts_list) if (!fmts_list)
return AVERROR(ENOMEM); return AVERROR(ENOMEM);
return ff_set_common_formats(ctx, fmts_list); return ff_set_common_formats(ctx, fmts_list);