summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLuca Barbato <lu_zero@gentoo.org>2016-12-15 23:07:33 +0000
committerAnton Khirnov <anton@khirnov.net>2017-02-04 15:26:04 +0100
commitbfa4bd81fcb21565b71ae7982a53f7dea0c6c199 (patch)
tree78a6af9d67a709a9a2a93bb32de8d3f38bad630e
parent8b2402483cd87866604f5702e067905853096306 (diff)
wip: cuvid: Relax the constraint about the cuda output
The npp scaler is a valid consumer for cuda frames.
-rw-r--r--avconv_cuvid.c9
1 files changed, 0 insertions, 9 deletions
diff --git a/avconv_cuvid.c b/avconv_cuvid.c
index 5c4d21c887..440287ebaa 100644
--- a/avconv_cuvid.c
+++ b/avconv_cuvid.c
@@ -69,15 +69,6 @@ int cuvid_transcode_init(OutputStream *ost)
ist = input_streams[ost->source_index];
- /* check if the encoder supports CUVID */
- if (!ost->enc->pix_fmts)
- goto cancel;
- for (pix_fmt = ost->enc->pix_fmts; *pix_fmt != AV_PIX_FMT_NONE; pix_fmt++)
- if (*pix_fmt == AV_PIX_FMT_CUDA)
- break;
- if (*pix_fmt == AV_PIX_FMT_NONE)
- goto cancel;
-
/* check if the decoder supports CUVID */
if (ist->hwaccel_id != HWACCEL_CUVID || !ist->dec || !ist->dec->pix_fmts)
goto cancel;