From 9f8e57efe4400ca86352277873792792279c3b15 Mon Sep 17 00:00:00 2001 From: Gwenole Beauchesne Date: Tue, 28 Jul 2015 10:16:59 +0200 Subject: vaapi: define a unique pixel format for VA-API (AV_PIX_FMT_VAAPI). Deprecate older VA pixel formats (MOCO, IDCT) as it is now very unlikely to ever be useful in the future. Only keep plain AV_PIX_FMT_VAAPI format that is aliased to the older VLD variant. This is an API change. Signed-off-by: Gwenole Beauchesne --- libavutil/pixdesc.c | 9 +++++++++ 1 file changed, 9 insertions(+) (limited to 'libavutil/pixdesc.c') diff --git a/libavutil/pixdesc.c b/libavutil/pixdesc.c index eb0dc9d311..eb52113745 100644 --- a/libavutil/pixdesc.c +++ b/libavutil/pixdesc.c @@ -1208,6 +1208,7 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { }, .flags = AV_PIX_FMT_FLAG_RGB, }, +#if FF_API_VAAPI [AV_PIX_FMT_VAAPI_MOCO] = { .name = "vaapi_moco", .log2_chroma_w = 1, @@ -1226,6 +1227,14 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { .log2_chroma_h = 1, .flags = AV_PIX_FMT_FLAG_HWACCEL, }, +#else + [AV_PIX_FMT_VAAPI] = { + .name = "vaapi", + .log2_chroma_w = 1, + .log2_chroma_h = 1, + .flags = AV_PIX_FMT_FLAG_HWACCEL, + }, +#endif [AV_PIX_FMT_YUV420P9LE] = { .name = "yuv420p9le", .nb_components = 3, -- cgit v1.2.1