diff options
| author | Anton Khirnov <anton@khirnov.net> | 2017-02-11 16:49:34 +0100 |
|---|---|---|
| committer | Anton Khirnov <anton@khirnov.net> | 2017-07-26 23:24:34 +0200 |
| commit | b9129ec4668c511e0a79e25c6f25d748cee172c9 (patch) | |
| tree | f3ace45abdc775d65ed2361958e26966d33c47ca /avtools | |
| parent | 704311b2946d74a80f65906961cd9baaa18683a3 (diff) | |
h264dec: add a CUVID hwaccel
Some parts of the code are based on a patch by
Timo Rothenpieler <timo@rothenpieler.org>
Diffstat (limited to 'avtools')
| -rw-r--r-- | avtools/avconv.h | 1 | ||||
| -rw-r--r-- | avtools/avconv_opt.c | 4 |
2 files changed, 5 insertions, 0 deletions
diff --git a/avtools/avconv.h b/avtools/avconv.h index 4c699333a5..b5843fbc03 100644 --- a/avtools/avconv.h +++ b/avtools/avconv.h @@ -58,6 +58,7 @@ enum HWAccelID { HWACCEL_QSV, HWACCEL_VAAPI, HWACCEL_D3D11VA, + HWACCEL_CUVID, }; typedef struct HWAccel { diff --git a/avtools/avconv_opt.c b/avtools/avconv_opt.c index 575ce120dd..df693360a7 100644 --- a/avtools/avconv_opt.c +++ b/avtools/avconv_opt.c @@ -80,6 +80,10 @@ const HWAccel hwaccels[] = { { "vaapi", hwaccel_decode_init, HWACCEL_VAAPI, AV_PIX_FMT_VAAPI, AV_HWDEVICE_TYPE_VAAPI }, #endif +#if CONFIG_CUVID + { "cuvid", hwaccel_decode_init, HWACCEL_CUVID, AV_PIX_FMT_CUDA, + AV_HWDEVICE_TYPE_CUDA }, +#endif { 0 }, }; int hwaccel_lax_profile_check = 0; |