* qatar/master: Add version bump and APIchanges entry for Add AV_PIX_FMT_VDPAU. pixfmt: add picture format for VDPAU Conflicts: doc/APIchanges libavutil/pixfmt.h libavutil/version.h
Unified · Split
| @@ -132,11 +132,14 @@ API changes, most recent first: · 131 unmodified lines | ||
| 132 | 132 | 2012-03-26 - a67d9cf - lavfi 2.66.100 |
| 133 | 133 | Add avfilter_fill_frame_from_{audio_,}buffer_ref() functions. |
| 134 | 134 | |
| 135 | +2013-01-12 - 169fb94 - lavu 52.4.0 - pixdesc.h | |
| 136 | + Add AV_PIX_FMT_VDPAU flag. | |
| 137 | + | |
| 135 | 138 | 2013-01-07 - 074a00d - lavr 1.1.0 |
| 136 | 139 | Add avresample_set_channel_mapping() for input channel reordering, |
| 137 | 140 | duplication, and silencing. |
| 138 | 141 | |
| 139 | −2012-12-29 - d8fd06c - lavu 52.2.1 - avstring.h | |
| 142 | +2012-12-29 - d8fd06c - lavu 52.3.0 - avstring.h | |
| 140 | 143 | Add av_basename() and av_dirname(). |
| 141 | 144 | |
| 142 | 145 | 2012-11-11 - 5980f5d - lavu 52.2.0 - audioconvert.h |
| @@ -1654,6 +1654,12 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 1653 unmodified lines | ||
| 1654 | 1654 | }, |
| 1655 | 1655 | .flags = PIX_FMT_BE | PIX_FMT_PLANAR | PIX_FMT_RGB, |
| 1656 | 1656 | }, |
| 1657 | + [AV_PIX_FMT_VDPAU] = { | |
| 1658 | + .name = "vdpau", | |
| 1659 | + .log2_chroma_w = 1, | |
| 1660 | + .log2_chroma_h = 1, | |
| 1661 | + .flags = PIX_FMT_HWACCEL, | |
| 1662 | + }, | |
| 1657 | 1663 | }; |
| 1658 | 1664 | |
| 1659 | 1665 | static enum AVPixelFormat get_pix_fmt_internal(const char *name) |
| @@ -200,6 +200,8 @@ enum AVPixelFormat { · 199 unmodified lines | ||
| 200 | 200 | AV_PIX_FMT_YUVA444P16BE, ///< planar YUV 4:4:4 64bpp, (1 Cr & Cb sample per 1x1 Y & A samples, big-endian) |
| 201 | 201 | AV_PIX_FMT_YUVA444P16LE, ///< planar YUV 4:4:4 64bpp, (1 Cr & Cb sample per 1x1 Y & A samples, little-endian) |
| 202 | 202 | |
| 203 | + AV_PIX_FMT_VDPAU, ///< HW acceleration through VDPAU, Picture.data[3] contains a VdpVideoSurface | |
| 204 | + | |
| 203 | 205 | #ifndef AV_PIX_FMT_ABI_GIT_MASTER |
| 204 | 206 | 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 |
| 205 | 207 | 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 { · 23 unmodified lines | ||
| 229 | 231 | AV_PIX_FMT_GBRP12LE, ///< planar GBR 4:4:4 36bpp, little-endian |
| 230 | 232 | AV_PIX_FMT_GBRP14BE, ///< planar GBR 4:4:4 42bpp, big-endian |
| 231 | 233 | AV_PIX_FMT_GBRP14LE, ///< planar GBR 4:4:4 42bpp, little-endian |
| 232 | − | |
| 233 | 234 | 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 |
| 234 | 235 | |
| 235 | 236 | #if FF_API_PIX_FMT |
| @@ -75,7 +75,7 @@ · 74 unmodified lines | ||
| 75 | 75 | */ |
| 76 | 76 | |
| 77 | 77 | #define LIBAVUTIL_VERSION_MAJOR 52 |
| 78 | −#define LIBAVUTIL_VERSION_MINOR 13 | |
| 78 | +#define LIBAVUTIL_VERSION_MINOR 14 | |
| 79 | 79 | #define LIBAVUTIL_VERSION_MICRO 100 |
| 80 | 80 | |
| 81 | 81 | #define LIBAVUTIL_VERSION_INT AV_VERSION_INT(LIBAVUTIL_VERSION_MAJOR, \ |