lavfi: add gbrap support to some filters
authorPaul B Mahol <onemda@gmail.com>
Mon, 6 May 2013 15:36:20 +0000 (15:36 +0000)
committerPaul B Mahol <onemda@gmail.com>
Wed, 8 May 2013 12:48:05 +0000 (12:48 +0000)
Signed-off-by: Paul B Mahol <onemda@gmail.com>
libavfilter/vf_blend.c
libavfilter/vf_extractplanes.c
libavfilter/vf_geq.c
libavfilter/vf_histogram.c

index e855b28..b4c62ba 100644 (file)
@@ -283,7 +283,7 @@ static int query_formats(AVFilterContext *ctx)
         AV_PIX_FMT_YUVA444P, AV_PIX_FMT_YUVA422P, AV_PIX_FMT_YUVA420P,
         AV_PIX_FMT_YUVJ444P, AV_PIX_FMT_YUVJ440P, AV_PIX_FMT_YUVJ422P,AV_PIX_FMT_YUVJ420P,
         AV_PIX_FMT_YUV444P, AV_PIX_FMT_YUV440P, AV_PIX_FMT_YUV422P, AV_PIX_FMT_YUV420P, AV_PIX_FMT_YUV410P,
-        AV_PIX_FMT_GBRP, AV_PIX_FMT_GRAY8, AV_PIX_FMT_NONE
+        AV_PIX_FMT_GBRP, AV_PIX_FMT_GBRAP, AV_PIX_FMT_GRAY8, AV_PIX_FMT_NONE
     };
 
     ff_set_common_formats(ctx, ff_make_format_list(pix_fmts));
index 9c2c6b7..84e620a 100644 (file)
@@ -75,8 +75,9 @@ static int query_formats(AVFilterContext *ctx)
         AV_PIX_FMT_YUV444P16BE, AV_PIX_FMT_YUVA444P16BE,
         AV_PIX_FMT_GRAY8, AV_PIX_FMT_GRAY8A,
         AV_PIX_FMT_GRAY16LE, AV_PIX_FMT_GRAY16BE,
-        AV_PIX_FMT_GBRP,
+        AV_PIX_FMT_GBRP, AV_PIX_FMT_GBRAP,
         AV_PIX_FMT_GBRP16LE, AV_PIX_FMT_GBRP16BE,
+        AV_PIX_FMT_GBRAP16LE, AV_PIX_FMT_GBRAP16BE,
         AV_PIX_FMT_NONE,
     };
     static const enum AVPixelFormat out8_pixfmts[] = { AV_PIX_FMT_GRAY8, AV_PIX_FMT_NONE };
index 89467bc..a5396f8 100644 (file)
@@ -165,7 +165,7 @@ static int geq_query_formats(AVFilterContext *ctx)
         AV_PIX_FMT_NONE
     };
     static const enum PixelFormat rgb_pix_fmts[] = {
-        AV_PIX_FMT_GBRP,
+        AV_PIX_FMT_GBRP, AV_PIX_FMT_GBRAP,
         AV_PIX_FMT_NONE
     };
     if (geq->is_rgb) {
index 3daa482..f3fc9ff 100644 (file)
@@ -80,7 +80,7 @@ static const enum AVPixelFormat color_pix_fmts[] = {
 
 static const enum AVPixelFormat levels_pix_fmts[] = {
     AV_PIX_FMT_YUV444P, AV_PIX_FMT_YUVA444P, AV_PIX_FMT_YUVJ444P,
-    AV_PIX_FMT_GRAY8, AV_PIX_FMT_GBRP, AV_PIX_FMT_NONE
+    AV_PIX_FMT_GRAY8, AV_PIX_FMT_GBRP, AV_PIX_FMT_GBRAP, AV_PIX_FMT_NONE
 };
 
 static int query_formats(AVFilterContext *ctx)
@@ -119,6 +119,7 @@ static int config_input(AVFilterLink *inlink)
     h->ncomp = desc->nb_components;
 
     switch (inlink->format) {
+    case AV_PIX_FMT_GBRAP:
     case AV_PIX_FMT_GBRP:
         h->bg_color = black_gbrp_color;
         h->fg_color = white_gbrp_color;