From 169fb94f0f65dcb18549f6f25fb29ea58d7eaf92 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9mi=20Denis-Courmont?= Date: Fri, 11 Jan 2013 23:27:58 +0200 Subject: [PATCH 1/2] pixfmt: add picture format for VDPAU Signed-off-by: Diego Biurrun --- libavutil/pixdesc.c | 6 ++++++ libavutil/pixfmt.h | 1 + 2 files changed, 7 insertions(+) diff --git a/libavutil/pixdesc.c b/libavutil/pixdesc.c index 06d5defdba..df906ac15a 100644 --- a/libavutil/pixdesc.c +++ b/libavutil/pixdesc.c @@ -1359,6 +1359,12 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { }, .flags = PIX_FMT_BE | PIX_FMT_PLANAR | PIX_FMT_RGB, }, + [AV_PIX_FMT_VDPAU] = { + .name = "vdpau", + .log2_chroma_w = 1, + .log2_chroma_h = 1, + .flags = PIX_FMT_HWACCEL, + }, }; static enum AVPixelFormat get_pix_fmt_internal(const char *name) diff --git a/libavutil/pixfmt.h b/libavutil/pixfmt.h index 1072f00895..1863099037 100644 --- a/libavutil/pixfmt.h +++ b/libavutil/pixfmt.h @@ -178,6 +178,7 @@ enum AVPixelFormat { AV_PIX_FMT_YUVA422P16LE, ///< planar YUV 4:2:2 48bpp, (1 Cr & Cb sample per 2x1 Y & A samples, little-endian) AV_PIX_FMT_YUVA444P16BE, ///< planar YUV 4:4:4 64bpp, (1 Cr & Cb sample per 1x1 Y & A samples, big-endian) AV_PIX_FMT_YUVA444P16LE, ///< planar YUV 4:4:4 64bpp, (1 Cr & Cb sample per 1x1 Y & A samples, little-endian) + AV_PIX_FMT_VDPAU, ///< HW acceleration through VDPAU, Picture.data[3] contains a VdpVideoSurface 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 From f89466ad6fd69ea570790e9227e612a751703a37 Mon Sep 17 00:00:00 2001 From: Diego Biurrun Date: Sat, 12 Jan 2013 12:21:33 +0100 Subject: [PATCH 2/2] Add version bump and APIchanges entry for Add AV_PIX_FMT_VDPAU. Also fix a lavu version typo in APIchanges. --- doc/APIchanges | 5 ++++- libavutil/version.h | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/doc/APIchanges b/doc/APIchanges index 6e212dacfa..8c8c9831d2 100644 --- a/doc/APIchanges +++ b/doc/APIchanges @@ -13,11 +13,14 @@ libavutil: 2012-10-22 API changes, most recent first: +2013-01-12 - 169fb94 - lavu 52.4.0 - pixdesc.h + Add AV_PIX_FMT_VDPAU flag. + 2013-01-07 - 074a00d - lavr 1.1.0 Add avresample_set_channel_mapping() for input channel reordering, duplication, and silencing. -2012-12-29 - d8fd06c - lavu 52.2.1 - avstring.h +2012-12-29 - d8fd06c - lavu 52.3.0 - avstring.h Add av_basename() and av_dirname(). 2012-11-11 - 5980f5d - lavu 52.2.0 - audioconvert.h diff --git a/libavutil/version.h b/libavutil/version.h index 1dbb11ca21..83a1f819d3 100644 --- a/libavutil/version.h +++ b/libavutil/version.h @@ -37,7 +37,7 @@ */ #define LIBAVUTIL_VERSION_MAJOR 52 -#define LIBAVUTIL_VERSION_MINOR 3 +#define LIBAVUTIL_VERSION_MINOR 4 #define LIBAVUTIL_VERSION_MICRO 0 #define LIBAVUTIL_VERSION_INT AV_VERSION_INT(LIBAVUTIL_VERSION_MAJOR, \