summaryrefslogtreecommitdiff
path: root/libavcodec/vp9.c
diff options
context:
space:
mode:
authorTimo Rothenpieler <timo@rothenpieler.org>2015-12-19 20:31:00 +0100
committerTimo Rothenpieler <timo@rothenpieler.org>2015-12-22 12:54:23 +0100
commitd7c2b75681e5d8942af6b0c30abf6e79b474d819 (patch)
tree9c91a9e6d7e3aabc395e35f1951e732d085a7a6f /libavcodec/vp9.c
parentb18230ee8c166eddcef8592c3217b4f1c3fc33c9 (diff)
vaapi: Add VP9 hwaccell support
Signed-off-by: Timo Rothenpieler <timo@rothenpieler.org>
Diffstat (limited to 'libavcodec/vp9.c')
-rw-r--r--libavcodec/vp9.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/libavcodec/vp9.c b/libavcodec/vp9.c
index fdcb89520e..d5bdbc7e6c 100644
--- a/libavcodec/vp9.c
+++ b/libavcodec/vp9.c
@@ -240,7 +240,7 @@ fail:
static int update_size(AVCodecContext *ctx, int w, int h)
{
-#define HWACCEL_MAX (CONFIG_VP9_DXVA2_HWACCEL + CONFIG_VP9_D3D11VA_HWACCEL)
+#define HWACCEL_MAX (CONFIG_VP9_DXVA2_HWACCEL + CONFIG_VP9_D3D11VA_HWACCEL + CONFIG_VP9_VAAPI_HWACCEL)
enum AVPixelFormat pix_fmts[HWACCEL_MAX + 2], *fmtp = pix_fmts;
VP9Context *s = ctx->priv_data;
uint8_t *p;
@@ -261,6 +261,9 @@ static int update_size(AVCodecContext *ctx, int w, int h)
#if CONFIG_VP9_D3D11VA_HWACCEL
*fmtp++ = AV_PIX_FMT_D3D11VA_VLD;
#endif
+#if CONFIG_VP9_VAAPI_HWACCEL
+ *fmtp++ = AV_PIX_FMT_VAAPI;
+#endif
}
*fmtp++ = s->pix_fmt;