diff options
| author | Paul B Mahol <onemda@gmail.com> | 2017-04-10 17:34:19 +0200 |
|---|---|---|
| committer | Paul B Mahol <onemda@gmail.com> | 2017-04-10 17:37:07 +0200 |
| commit | 0c4d75d92e3a4f3554b63e930255ac8efc5aae1f (patch) | |
| tree | 85517941715763bb683d57e0cead25ab0ae79cbb /libavfilter/vf_alphamerge.c | |
| parent | d6b9f2b7da8eff480c4c454841d769b75e30f536 (diff) | |
| download | ffmpeg-0c4d75d92e3a4f3554b63e930255ac8efc5aae1f.tar.gz | |
avfilter/vf_alphamerge: add GBRAP support
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Diffstat (limited to 'libavfilter/vf_alphamerge.c')
| -rw-r--r-- | libavfilter/vf_alphamerge.c | 4 |
1 files changed, 3 insertions, 1 deletions
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; } |