diff --git a/doc/APIchanges b/doc/APIchanges index 4ec6ebb0d8912a184519ab244f126bd4bdb5a742..95c06749a3a9922682093363bfc672982a3e3a78 100644 --- a/doc/APIchanges +++ b/doc/APIchanges @@ -132,11 +132,14 @@ API changes, most recent first: 2012-03-26 - a67d9cf - lavfi 2.66.100 Add avfilter_fill_frame_from_{audio_,}buffer_ref() functions. +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/pixdesc.c b/libavutil/pixdesc.c index f9be147ad9b7f0d279c44a3c0d3f680d65b33684..1016dbaecbaf47dc4a3193e691486633406045c0 100644 --- a/libavutil/pixdesc.c +++ b/libavutil/pixdesc.c @@ -1654,6 +1654,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 457d9a8cc9cab99dcb77e0426d08503b362ce9b7..1c00ac4796b19cc94dd89d9aaec35dbf3a512f91 100644 --- a/libavutil/pixfmt.h +++ b/libavutil/pixfmt.h @@ -200,6 +200,8 @@ enum AVPixelFormat { 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 + #ifndef AV_PIX_FMT_ABI_GIT_MASTER AV_PIX_FMT_RGBA64BE=0x123, ///< packed RGBA 16:16:16:16, 64bpp, 16R, 16G, 16B, 16A, the 2-byte value for each R/G/B/A component is stored as big-endian AV_PIX_FMT_RGBA64LE, ///< packed RGBA 16:16:16:16, 64bpp, 16R, 16G, 16B, 16A, the 2-byte value for each R/G/B/A component is stored as little-endian @@ -229,7 +231,6 @@ enum AVPixelFormat { AV_PIX_FMT_GBRP12LE, ///< planar GBR 4:4:4 36bpp, little-endian AV_PIX_FMT_GBRP14BE, ///< planar GBR 4:4:4 42bpp, big-endian AV_PIX_FMT_GBRP14LE, ///< planar GBR 4:4:4 42bpp, little-endian - 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 e47e0d12b3f59092580ad98a23759b8d266e1b0c..f59fd9baeab194dac76743aeddaae7177a42c1b5 100644 --- a/libavutil/version.h +++ b/libavutil/version.h @@ -75,7 +75,7 @@ */ #define LIBAVUTIL_VERSION_MAJOR 52 -#define LIBAVUTIL_VERSION_MINOR 13 +#define LIBAVUTIL_VERSION_MINOR 14 #define LIBAVUTIL_VERSION_MICRO 100 #define LIBAVUTIL_VERSION_INT AV_VERSION_INT(LIBAVUTIL_VERSION_MAJOR, \