diff options
| author | Philip Langdale <philipl@overt.org> | 2018-02-18 15:53:33 -0800 |
|---|---|---|
| committer | Mark Thompson <sw@jkqxz.net> | 2018-02-21 23:38:42 +0000 |
| commit | cd98f20b4abac8241ef7f922eb85ba6fe3fe230b (patch) | |
| tree | f3812aa760f21602dd3f8b9bd9405566da10cd4a /libavcodec/mjpegdec.c | |
| parent | 63c690ad154509dcda78d3d3537bd1af9c406241 (diff) | |
| download | ffmpeg-cd98f20b4abac8241ef7f922eb85ba6fe3fe230b.tar.gz | |
avcodec/nvdec: Implement mjpeg nvdec 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 939f2849d0..beef174618 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_NVDEC_HWACCEL + AV_PIX_FMT_CUDA, +#endif #if CONFIG_MJPEG_VAAPI_HWACCEL AV_PIX_FMT_VAAPI, #endif @@ -2780,6 +2783,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_NVDEC_HWACCEL + HWACCEL_NVDEC(mjpeg), +#endif #if CONFIG_MJPEG_VAAPI_HWACCEL HWACCEL_VAAPI(mjpeg), #endif |