ffmpeg | branch: master | Paul B Mahol <one...@gmail.com> | Mon Apr 10 17:34:19 2017 +0200| [0c4d75d92e3a4f3554b63e930255ac8efc5aae1f] | committer: Paul B Mahol
avfilter/vf_alphamerge: add GBRAP support Signed-off-by: Paul B Mahol <one...@gmail.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=0c4d75d92e3a4f3554b63e930255ac8efc5aae1f --- libavfilter/vf_alphamerge.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/libavfilter/vf_alphamerge.c b/libavfilter/vf_alphamerge.c index a4aa8dbe16..d0a2639689 100644 --- a/libavfilter/vf_alphamerge.c +++ b/libavfilter/vf_alphamerge.c @@ -54,6 +54,7 @@ static int query_formats(AVFilterContext *ctx) { static const enum AVPixelFormat main_fmts[] = { AV_PIX_FMT_YUVA444P, AV_PIX_FMT_YUVA422P, AV_PIX_FMT_YUVA420P, + AV_PIX_FMT_GBRAP, AV_PIX_FMT_RGBA, AV_PIX_FMT_BGRA, AV_PIX_FMT_ARGB, AV_PIX_FMT_ABGR, AV_PIX_FMT_NONE }; @@ -85,7 +86,8 @@ static int config_input_main(AVFilterLink *inlink) { AlphaMergeContext *merge = inlink->dst->priv; merge->is_packed_rgb = - ff_fill_rgba_map(merge->rgba_map, inlink->format) >= 0; + ff_fill_rgba_map(merge->rgba_map, inlink->format) >= 0 && + inlink->format != AV_PIX_FMT_GBRAP; return 0; } _______________________________________________ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
