diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-10-13 01:56:14 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-10-13 01:56:14 +0200 |
| commit | b8c50becc8cf9c73e236d3857e0f0faff539a95f (patch) | |
| tree | 6bd5d65a0169ed7f9ea44a0c1d5e8e94aa56d5db | |
| parent | 7a11333387b282410bd26ea7ee65cc9830796707 (diff) | |
| download | ffmpeg-b8c50becc8cf9c73e236d3857e0f0faff539a95f.tar.gz | |
avfilter/vf_pp: support AV_PIX_FMT_GRAY8
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavfilter/version.h | 2 | ||||
| -rw-r--r-- | libavfilter/vf_pp.c | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/libavfilter/version.h b/libavfilter/version.h index c5c806b5cb..f3448ede15 100644 --- a/libavfilter/version.h +++ b/libavfilter/version.h @@ -31,7 +31,7 @@ #define LIBAVFILTER_VERSION_MAJOR 5 #define LIBAVFILTER_VERSION_MINOR 1 -#define LIBAVFILTER_VERSION_MICRO 104 +#define LIBAVFILTER_VERSION_MICRO 105 #define LIBAVFILTER_VERSION_INT AV_VERSION_INT(LIBAVFILTER_VERSION_MAJOR, \ LIBAVFILTER_VERSION_MINOR, \ diff --git a/libavfilter/vf_pp.c b/libavfilter/vf_pp.c index 0ba860155b..162604d6a4 100644 --- a/libavfilter/vf_pp.c +++ b/libavfilter/vf_pp.c @@ -81,6 +81,7 @@ static int pp_query_formats(AVFilterContext *ctx) AV_PIX_FMT_YUV411P, AV_PIX_FMT_YUV444P, AV_PIX_FMT_YUVJ444P, AV_PIX_FMT_YUV440P, AV_PIX_FMT_YUVJ440P, + AV_PIX_FMT_GRAY8, AV_PIX_FMT_NONE }; ff_set_common_formats(ctx, ff_make_format_list(pix_fmts)); @@ -93,6 +94,7 @@ static int pp_config_props(AVFilterLink *inlink) PPFilterContext *pp = inlink->dst->priv; switch (inlink->format) { + case AV_PIX_FMT_GRAY8: case AV_PIX_FMT_YUVJ420P: case AV_PIX_FMT_YUV420P: flags |= PP_FORMAT_420; break; case AV_PIX_FMT_YUVJ422P: |