From d264c720f7b74286840719e506daba39f83b438b Mon Sep 17 00:00:00 2001 From: Mark Thompson Date: Mon, 7 Mar 2016 22:34:59 +0000 Subject: lavu: deprecate AV_PIX_FMT_VAAPI_*, replace with AV_PIX_FMT_VAAPI Signed-off-by: Anton Khirnov --- libavutil/pixfmt.h | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'libavutil/pixfmt.h') diff --git a/libavutil/pixfmt.h b/libavutil/pixfmt.h index 7d369f5520..c903a3f649 100644 --- a/libavutil/pixfmt.h +++ b/libavutil/pixfmt.h @@ -116,9 +116,14 @@ enum AVPixelFormat { AV_PIX_FMT_BGR555BE, ///< packed BGR 5:5:5, 16bpp, (msb)1A 5B 5G 5R(lsb), big-endian, most significant bit to 1 AV_PIX_FMT_BGR555LE, ///< packed BGR 5:5:5, 16bpp, (msb)1A 5B 5G 5R(lsb), little-endian, most significant bit to 1 +#if FF_API_VAAPI AV_PIX_FMT_VAAPI_MOCO, ///< HW acceleration through VA API at motion compensation entry-point, Picture.data[3] contains a vaapi_render_state struct which contains macroblocks as well as various fields extracted from headers AV_PIX_FMT_VAAPI_IDCT, ///< HW acceleration through VA API at IDCT entry-point, Picture.data[3] contains a vaapi_render_state struct which contains fields extracted from headers AV_PIX_FMT_VAAPI_VLD, ///< HW decoding through VA API, Picture.data[3] contains a VASurfaceID + AV_PIX_FMT_VAAPI = AV_PIX_FMT_VAAPI_VLD, +#else + AV_PIX_FMT_VAAPI, ///< HW decoding through VA API, Picture.data[3] contains a VASurfaceID +#endif AV_PIX_FMT_YUV420P16LE, ///< planar YUV 4:2:0, 24bpp, (1 Cr & Cb sample per 2x2 Y samples), little-endian AV_PIX_FMT_YUV420P16BE, ///< planar YUV 4:2:0, 24bpp, (1 Cr & Cb sample per 2x2 Y samples), big-endian -- cgit v1.2.3