OSDN Git Service
(root)
/
android-x86
/
external-ffmpeg.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
d6b9f2b
)
avfilter/vf_alphamerge: add GBRAP support
author
Paul B Mahol
<onemda@gmail.com>
Mon, 10 Apr 2017 15:34:19 +0000
(17:34 +0200)
committer
Paul B Mahol
<onemda@gmail.com>
Mon, 10 Apr 2017 15:37:07 +0000
(17:37 +0200)
Signed-off-by: Paul B Mahol <onemda@gmail.com>
libavfilter/vf_alphamerge.c
patch
|
blob
|
history
diff --git
a/libavfilter/vf_alphamerge.c
b/libavfilter/vf_alphamerge.c
index
a4aa8db
..
d0a2639
100644
(file)
--- 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;
}