]> git.sesse.net Git - ffmpeg/commitdiff
avfilter/vf_pp: support AV_PIX_FMT_GRAY8
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 12 Oct 2014 23:56:14 +0000 (01:56 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 12 Oct 2014 23:56:14 +0000 (01:56 +0200)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
libavfilter/version.h
libavfilter/vf_pp.c

index c5c806b5cbd56c65819707d14b70de4465b8084e..f3448ede15e17f044f38a7cceeb4f50a713855eb 100644 (file)
@@ -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, \
index 0ba860155ba2308d318ee19483cf36e442cec612..162604d6a4bc6102fe0c7a0f32f9b1f82f423232 100644 (file)
@@ -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: