diff options
| author | Paul B Mahol <onemda@gmail.com> | 2016-08-23 09:51:43 +0200 |
|---|---|---|
| committer | Paul B Mahol <onemda@gmail.com> | 2016-08-23 15:21:06 +0200 |
| commit | 68dc0c13f93b10cd41df6f4b3e92db1cb1aaf3b5 (patch) | |
| tree | 61b154e8e9e7c2621e658ad4e9d5c4c586906e39 /libavfilter/vf_maskedmerge.c | |
| parent | bb109dce18e94f9f29d759c771e3cf46e93ffca1 (diff) | |
| download | ffmpeg-68dc0c13f93b10cd41df6f4b3e92db1cb1aaf3b5.tar.gz | |
avfilter/vf_maskedmerge: add support for more pixel formats
Diffstat (limited to 'libavfilter/vf_maskedmerge.c')
| -rw-r--r-- | libavfilter/vf_maskedmerge.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/libavfilter/vf_maskedmerge.c b/libavfilter/vf_maskedmerge.c index 66f8fa56d2..46c88f45c1 100644 --- a/libavfilter/vf_maskedmerge.c +++ b/libavfilter/vf_maskedmerge.c @@ -47,13 +47,15 @@ static int query_formats(AVFilterContext *ctx) AV_PIX_FMT_YUVJ411P, AV_PIX_FMT_YUV411P, AV_PIX_FMT_YUV410P, AV_PIX_FMT_YUV420P9, AV_PIX_FMT_YUV422P9, AV_PIX_FMT_YUV444P9, AV_PIX_FMT_YUV420P10, AV_PIX_FMT_YUV422P10, AV_PIX_FMT_YUV444P10, + AV_PIX_FMT_YUV420P12, AV_PIX_FMT_YUV422P12, AV_PIX_FMT_YUV444P12, AV_PIX_FMT_YUV440P12, + AV_PIX_FMT_YUV420P14, AV_PIX_FMT_YUV422P14, AV_PIX_FMT_YUV444P14, AV_PIX_FMT_YUV420P16, AV_PIX_FMT_YUV422P16, AV_PIX_FMT_YUV444P16, AV_PIX_FMT_YUVA420P9, AV_PIX_FMT_YUVA422P9, AV_PIX_FMT_YUVA444P9, AV_PIX_FMT_YUVA420P10, AV_PIX_FMT_YUVA422P10, AV_PIX_FMT_YUVA444P10, AV_PIX_FMT_YUVA420P16, AV_PIX_FMT_YUVA422P16, AV_PIX_FMT_YUVA444P16, AV_PIX_FMT_GBRP, AV_PIX_FMT_GBRP9, AV_PIX_FMT_GBRP10, AV_PIX_FMT_GBRP12, AV_PIX_FMT_GBRP14, AV_PIX_FMT_GBRP16, - AV_PIX_FMT_GBRAP, AV_PIX_FMT_GBRAP16, + AV_PIX_FMT_GBRAP, AV_PIX_FMT_GBRAP12, AV_PIX_FMT_GBRAP16, AV_PIX_FMT_GRAY8, AV_PIX_FMT_GRAY16, AV_PIX_FMT_NONE }; |