diff options
| author | Paul B Mahol <onemda@gmail.com> | 2013-05-06 15:36:20 +0000 |
|---|---|---|
| committer | Paul B Mahol <onemda@gmail.com> | 2013-05-08 12:48:05 +0000 |
| commit | 1f2baec7bd6011f62603c45392b0bf718a44a8a0 (patch) | |
| tree | 53109f75edda10f2f4641391cdb6227df3e215cb | |
| parent | 5c057433ccd32f37ddc828d3f82c5b1ad7d3e3db (diff) | |
| download | ffmpeg-1f2baec7bd6011f62603c45392b0bf718a44a8a0.tar.gz | |
lavfi: add gbrap support to some filters
Signed-off-by: Paul B Mahol <onemda@gmail.com>
| -rw-r--r-- | libavfilter/vf_blend.c | 2 | ||||
| -rw-r--r-- | libavfilter/vf_extractplanes.c | 3 | ||||
| -rw-r--r-- | libavfilter/vf_geq.c | 2 | ||||
| -rw-r--r-- | libavfilter/vf_histogram.c | 3 |
4 files changed, 6 insertions, 4 deletions
diff --git a/libavfilter/vf_blend.c b/libavfilter/vf_blend.c index e855b28cc4..b4c62ba6fc 100644 --- a/libavfilter/vf_blend.c +++ b/libavfilter/vf_blend.c @@ -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)); diff --git a/libavfilter/vf_extractplanes.c b/libavfilter/vf_extractplanes.c index 9c2c6b7bb3..84e620af7b 100644 --- a/libavfilter/vf_extractplanes.c +++ b/libavfilter/vf_extractplanes.c @@ -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 }; diff --git a/libavfilter/vf_geq.c b/libavfilter/vf_geq.c index 89467bcfae..a5396f8b1e 100644 --- a/libavfilter/vf_geq.c +++ b/libavfilter/vf_geq.c @@ -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) { diff --git a/libavfilter/vf_histogram.c b/libavfilter/vf_histogram.c index 3daa482498..f3fc9ff321 100644 --- a/libavfilter/vf_histogram.c +++ b/libavfilter/vf_histogram.c @@ -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; |