diff options
| author | James Almer <jamrial@gmail.com> | 2020-03-03 13:16:55 -0300 |
|---|---|---|
| committer | James Almer <jamrial@gmail.com> | 2020-03-03 18:11:28 -0300 |
| commit | 60b1f85b67ccb907e4eba3e2c98839769690ed24 (patch) | |
| tree | 84ca27d268999c9fd4a2deba3d2faac05c348920 /fftools/ffmpeg_opt.c | |
| parent | 70209000fd1c7033b2039f4c906d0d0c6cd500b4 (diff) | |
| download | ffmpeg-60b1f85b67ccb907e4eba3e2c98839769690ed24.tar.gz | |
ffmpeg: remove superfluous custom cuvid hwaccel
It's a duplicate of the properly implemented nvdec libavcodec hwaccel
Reviewed-by: Timo Rothenpieler <timo@rothenpieler.org>
Signed-off-by: James Almer <jamrial@gmail.com>
Diffstat (limited to 'fftools/ffmpeg_opt.c')
| -rw-r--r-- | fftools/ffmpeg_opt.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/fftools/ffmpeg_opt.c b/fftools/ffmpeg_opt.c index 3bf90bd20c..1b721c4954 100644 --- a/fftools/ffmpeg_opt.c +++ b/fftools/ffmpeg_opt.c @@ -73,9 +73,6 @@ const HWAccel hwaccels[] = { #if CONFIG_LIBMFX { "qsv", qsv_init, HWACCEL_QSV, AV_PIX_FMT_QSV }, #endif -#if CONFIG_CUVID - { "cuvid", cuvid_init, HWACCEL_CUVID, AV_PIX_FMT_CUDA }, -#endif { 0 }, }; AVBufferRef *hw_device_ctx; @@ -822,7 +819,7 @@ static void add_input_streams(OptionsContext *o, AVFormatContext *ic) MATCH_PER_STREAM_OPT(hwaccels, str, hwaccel, ic, st); if (hwaccel) { // The NVDEC hwaccels use a CUDA device, so remap the name here. - if (!strcmp(hwaccel, "nvdec")) + if (!strcmp(hwaccel, "nvdec") || !strcmp(hwaccel, "cuvid")) hwaccel = "cuda"; if (!strcmp(hwaccel, "none")) |