* commit '66e6c8a7b4e3ac926302529606bd3e323c28b20f': lavu: Add a pixel format for new VDA hwaccel Conflicts: doc/APIchanges libavutil/pixfmt.h libavutil/version.h
Showing the changes to libavutil (3 of 4 files). Show all
Unified · Split
| @@ -1874,6 +1874,10 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 1873 unmodified lines | |||
| 1874 | }, | 1874 | }, |
| 1875 | .flags = AV_PIX_FMT_FLAG_PLANAR | AV_PIX_FMT_FLAG_BE, | 1875 | .flags = AV_PIX_FMT_FLAG_PLANAR | AV_PIX_FMT_FLAG_BE, |
| 1876 | }, | 1876 | }, |
| 1877 | [AV_PIX_FMT_VDA] = { | ||
| 1878 | .name = "vda", | ||
| 1879 | .flags = AV_PIX_FMT_FLAG_HWACCEL, | ||
| 1880 | }, | ||
| 1877 | }; | 1881 | }; |
| 1878 | 1882 | ||
| 1879 | FF_DISABLE_DEPRECATION_WARNINGS | 1883 | FF_DISABLE_DEPRECATION_WARNINGS |
| @@ -230,6 +230,8 @@ enum AVPixelFormat { · 229 unmodified lines | |||
| 230 | 230 | ||
| 231 | AV_PIX_FMT_YVYU422, ///< packed YUV 4:2:2, 16bpp, Y0 Cr Y1 Cb | 231 | AV_PIX_FMT_YVYU422, ///< packed YUV 4:2:2, 16bpp, Y0 Cr Y1 Cb |
| 232 | 232 | ||
| 233 | AV_PIX_FMT_VDA, ///< HW acceleration through VDA, data[3] contains a CVPixelBufferRef | ||
| 234 | |||
| 233 | #ifndef AV_PIX_FMT_ABI_GIT_MASTER | 235 | #ifndef AV_PIX_FMT_ABI_GIT_MASTER |
| 234 | 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 | 236 | 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 |
| 235 | 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 | 237 | 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 |
| @@ -56,7 +56,7 @@ · 55 unmodified lines | |||
| 56 | */ | 56 | */ |
| 57 | 57 | ||
| 58 | #define LIBAVUTIL_VERSION_MAJOR 52 | 58 | #define LIBAVUTIL_VERSION_MAJOR 52 |
| 59 | #define LIBAVUTIL_VERSION_MINOR 82 | 59 | #define LIBAVUTIL_VERSION_MINOR 83 |
| 60 | #define LIBAVUTIL_VERSION_MICRO 100 | 60 | #define LIBAVUTIL_VERSION_MICRO 100 |
| 61 | 61 | ||
| 62 | #define LIBAVUTIL_VERSION_INT AV_VERSION_INT(LIBAVUTIL_VERSION_MAJOR, \ | 62 | #define LIBAVUTIL_VERSION_INT AV_VERSION_INT(LIBAVUTIL_VERSION_MAJOR, \ |