aboutsummaryrefslogtreecommitdiffstats
path: root/libavfilter
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2014-10-12 19:13:20 +0200
committerMichael Niedermayer <michaelni@gmx.at>2014-10-12 22:22:39 +0200
commit9a460db63be7f24768edea48dc94b8a754068efd (patch)
tree246b79b78f8d7b70dd679f674161b9829bc2203c /libavfilter
parent1d3c87d6cdc9d452f9c9c5ba2a017033aee16686 (diff)
downloadffmpeg-9a460db63be7f24768edea48dc94b8a754068efd.tar.gz
avfilter/vf_pp: add yuv 4:4:0 support
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavfilter')
-rw-r--r--libavfilter/version.h2
-rw-r--r--libavfilter/vf_pp.c3
2 files changed, 4 insertions, 1 deletions
diff --git a/libavfilter/version.h b/libavfilter/version.h
index 40dc3fdbcb..c5c806b5cb 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 103
+#define LIBAVFILTER_VERSION_MICRO 104
#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 c72fdc6112..0ba860155b 100644
--- a/libavfilter/vf_pp.c
+++ b/libavfilter/vf_pp.c
@@ -80,6 +80,7 @@ static int pp_query_formats(AVFilterContext *ctx)
AV_PIX_FMT_YUV422P, AV_PIX_FMT_YUVJ422P,
AV_PIX_FMT_YUV411P,
AV_PIX_FMT_YUV444P, AV_PIX_FMT_YUVJ444P,
+ AV_PIX_FMT_YUV440P, AV_PIX_FMT_YUVJ440P,
AV_PIX_FMT_NONE
};
ff_set_common_formats(ctx, ff_make_format_list(pix_fmts));
@@ -99,6 +100,8 @@ static int pp_config_props(AVFilterLink *inlink)
case AV_PIX_FMT_YUV411P: flags |= PP_FORMAT_411; break;
case AV_PIX_FMT_YUVJ444P:
case AV_PIX_FMT_YUV444P: flags |= PP_FORMAT_444; break;
+ case AV_PIX_FMT_YUVJ440P:
+ case AV_PIX_FMT_YUV440P: flags |= PP_FORMAT_440; break;
default: av_assert0(0);
}