From 63c690ad154509dcda78d3d3537bd1af9c406241 Mon Sep 17 00:00:00 2001
From: Mark Thompson <sw@jkqxz.net>
Date: Thu, 23 Nov 2017 23:47:52 +0000
Subject: vaapi: Add MJPEG decode hwaccel

---
 libavcodec/mjpegdec.c | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'libavcodec/mjpegdec.c')

diff --git a/libavcodec/mjpegdec.c b/libavcodec/mjpegdec.c
index 6141f06367..939f2849d0 100644
--- a/libavcodec/mjpegdec.c
+++ b/libavcodec/mjpegdec.c
@@ -650,6 +650,9 @@ unk_pixfmt:
         s->avctx->pix_fmt = s->hwaccel_pix_fmt;
     } else {
         enum AVPixelFormat pix_fmts[] = {
+#if CONFIG_MJPEG_VAAPI_HWACCEL
+            AV_PIX_FMT_VAAPI,
+#endif
             s->avctx->pix_fmt,
             AV_PIX_FMT_NONE,
         };
@@ -2777,6 +2780,9 @@ AVCodec ff_mjpeg_decoder = {
     .caps_internal  = FF_CODEC_CAP_INIT_THREADSAFE |
                       FF_CODEC_CAP_SKIP_FRAME_FILL_PARAM,
     .hw_configs     = (const AVCodecHWConfigInternal*[]) {
+#if CONFIG_MJPEG_VAAPI_HWACCEL
+                        HWACCEL_VAAPI(mjpeg),
+#endif
                         NULL
                     },
 };
-- 
cgit v1.2.3