From 66e6c8a7b4e3ac926302529606bd3e323c28b20f Mon Sep 17 00:00:00 2001 From: Anton Khirnov Date: Thu, 6 Mar 2014 14:07:42 +0100 Subject: lavu: Add a pixel format for new VDA hwaccel The current hwaccel is broken and cannot be fixed in a compatible way. It will be deprecated and replaced with a new one. --- libavutil/pixdesc.c | 4 ++++ libavutil/pixfmt.h | 1 + libavutil/version.h | 2 +- 3 files changed, 6 insertions(+), 1 deletion(-) (limited to 'libavutil') diff --git a/libavutil/pixdesc.c b/libavutil/pixdesc.c index 80c97b0096..ced3e46634 100644 --- a/libavutil/pixdesc.c +++ b/libavutil/pixdesc.c @@ -1494,6 +1494,10 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { }, .flags = AV_PIX_FMT_FLAG_PLANAR | AV_PIX_FMT_FLAG_BE, }, + [AV_PIX_FMT_VDA] = { + .name = "vda", + .flags = AV_PIX_FMT_FLAG_HWACCEL, + }, }; FF_DISABLE_DEPRECATION_WARNINGS diff --git a/libavutil/pixfmt.h b/libavutil/pixfmt.h index bfd16e64e2..99a926f00f 100644 --- a/libavutil/pixfmt.h +++ b/libavutil/pixfmt.h @@ -198,6 +198,7 @@ enum AVPixelFormat { AV_PIX_FMT_YVYU422, ///< packed YUV 4:2:2, 16bpp, Y0 Cr Y1 Cb + AV_PIX_FMT_VDA, ///< HW acceleration through VDA, data[3] contains a CVPixelBufferRef AV_PIX_FMT_NB, ///< number of pixel formats, DO NOT USE THIS if you want to link with shared libav* because the number of formats might differ between versions #if FF_API_PIX_FMT diff --git a/libavutil/version.h b/libavutil/version.h index 9d3e7f31fc..43e7947121 100644 --- a/libavutil/version.h +++ b/libavutil/version.h @@ -54,7 +54,7 @@ */ #define LIBAVUTIL_VERSION_MAJOR 53 -#define LIBAVUTIL_VERSION_MINOR 13 +#define LIBAVUTIL_VERSION_MINOR 14 #define LIBAVUTIL_VERSION_MICRO 0 #define LIBAVUTIL_VERSION_INT AV_VERSION_INT(LIBAVUTIL_VERSION_MAJOR, \ -- cgit v1.2.3