diff options
| author | Mark Thompson <sw@jkqxz.net> | 2017-11-23 23:47:52 +0000 |
|---|---|---|
| committer | Mark Thompson <sw@jkqxz.net> | 2018-02-21 23:38:30 +0000 |
| commit | 63c690ad154509dcda78d3d3537bd1af9c406241 (patch) | |
| tree | 99b8b0e1f7fa63f12f9aa194f4a059415379ebc1 /libavcodec/mjpegdec.c | |
| parent | 99ab0a13dc231b92dcd207f58a1101fe5f11d663 (diff) | |
| download | ffmpeg-63c690ad154509dcda78d3d3537bd1af9c406241.tar.gz | |
vaapi: Add MJPEG decode hwaccel
Diffstat (limited to 'libavcodec/mjpegdec.c')
| -rw-r--r-- | libavcodec/mjpegdec.c | 6 |
1 files changed, 6 insertions, 0 deletions
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 }, }; |