[FFmpeg-cvslog] vf_fade: use AVPixFmtDescriptor to find out if pixel format have alpha

Paul B Mahol git at videolan.org
Fri Jan 18 23:53:34 CET 2013


ffmpeg | branch: master | Paul B Mahol <onemda at gmail.com> | Fri Jan 18 15:08:50 2013 +0000| [c79be51dfc807e8d17d2b0a28ee6143e18c63749] | committer: Paul B Mahol

vf_fade: use AVPixFmtDescriptor to find out if pixel format have alpha

Remove alpha_pix_fmts[].

Signed-off-by: Paul B Mahol <onemda at gmail.com>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=c79be51dfc807e8d17d2b0a28ee6143e18c63749
---

 libavfilter/vf_fade.c |    9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/libavfilter/vf_fade.c b/libavfilter/vf_fade.c
index ee3c0c2..df22274 100644
--- a/libavfilter/vf_fade.c
+++ b/libavfilter/vf_fade.c
@@ -138,13 +138,6 @@ const static enum AVPixelFormat studio_level_pix_fmts[] = {
     AV_PIX_FMT_NONE
 };
 
-static enum AVPixelFormat alpha_pix_fmts[] = {
-    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 int config_props(AVFilterLink *inlink)
 {
     FadeContext *fade = inlink->dst->priv;
@@ -154,7 +147,7 @@ static int config_props(AVFilterLink *inlink)
     fade->vsub = pixdesc->log2_chroma_h;
 
     fade->bpp = av_get_bits_per_pixel(pixdesc) >> 3;
-    fade->alpha = fade->alpha ? ff_fmt_is_in(inlink->format, alpha_pix_fmts) : 0;
+    fade->alpha &= pixdesc->flags & PIX_FMT_ALPHA;
     fade->is_packed_rgb = ff_fill_rgba_map(fade->rgba_map, inlink->format) >= 0;
 
     /* use CCIR601/709 black level for studio-level pixel non-alpha components */



More information about the ffmpeg-cvslog mailing list