aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTimo Rothenpieler <timo@rothenpieler.org>2018-05-09 22:30:34 +0200
committerTimo Rothenpieler <timo@rothenpieler.org>2018-05-10 00:34:22 +0200
commit1c15d266150c29ea1d993e1da43769ec880ff9c7 (patch)
tree6729486a387b5cec0b401326b45f76d60d56233c
parentece068a771ac3f725e854c681ecbef08e792addc (diff)
downloadffmpeg-1c15d266150c29ea1d993e1da43769ec880ff9c7.tar.gz
avfilter/vf_hwupload_cuda: update supported pix_fmts
-rw-r--r--libavfilter/version.h2
-rw-r--r--libavfilter/vf_hwupload_cuda.c1
2 files changed, 2 insertions, 1 deletions
diff --git a/libavfilter/version.h b/libavfilter/version.h
index 271e5fc20f..93dd173fc9 100644
--- a/libavfilter/version.h
+++ b/libavfilter/version.h
@@ -31,7 +31,7 @@
#define LIBAVFILTER_VERSION_MAJOR 7
#define LIBAVFILTER_VERSION_MINOR 21
-#define LIBAVFILTER_VERSION_MICRO 100
+#define LIBAVFILTER_VERSION_MICRO 101
#define LIBAVFILTER_VERSION_INT AV_VERSION_INT(LIBAVFILTER_VERSION_MAJOR, \
LIBAVFILTER_VERSION_MINOR, \
diff --git a/libavfilter/vf_hwupload_cuda.c b/libavfilter/vf_hwupload_cuda.c
index 063f0285c3..4d83e6c8f2 100644
--- a/libavfilter/vf_hwupload_cuda.c
+++ b/libavfilter/vf_hwupload_cuda.c
@@ -59,6 +59,7 @@ static int cudaupload_query_formats(AVFilterContext *ctx)
static const enum AVPixelFormat input_pix_fmts[] = {
AV_PIX_FMT_NV12, AV_PIX_FMT_YUV420P, AV_PIX_FMT_YUV444P,
AV_PIX_FMT_P010, AV_PIX_FMT_P016, AV_PIX_FMT_YUV444P16,
+ AV_PIX_FMT_0RGB32, AV_PIX_FMT_0BGR32,
AV_PIX_FMT_NONE,
};
static const enum AVPixelFormat output_pix_fmts[] = {