summaryrefslogtreecommitdiff
path: root/libavcodec/nvdec.c
diff options
context:
space:
mode:
authorJames Almer <jamrial@gmail.com>2017-11-10 20:38:36 -0300
committerJames Almer <jamrial@gmail.com>2017-11-10 20:43:15 -0300
commit1178babacaaad4e65fcb28af447afd586429c51a (patch)
treeb29b1aaba933e628c9363e1b5fcc32332224705b /libavcodec/nvdec.c
parentec54df7dcd5935cc5efa6a25293b255a5d9a67f5 (diff)
parentb90fdb2c7199cc8b0e8d994fafba1fb4dc181d88 (diff)
Merge commit 'b90fdb2c7199cc8b0e8d994fafba1fb4dc181d88'
* commit 'b90fdb2c7199cc8b0e8d994fafba1fb4dc181d88': hevcdec: add a CUVID hwaccel Adapted for ffmpeg by Timo Rothenpieler. Merged-by: James Almer <jamrial@gmail.com>
Diffstat (limited to 'libavcodec/nvdec.c')
-rw-r--r--libavcodec/nvdec.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/libavcodec/nvdec.c b/libavcodec/nvdec.c
index 9ca9faa378..ab66b91a92 100644
--- a/libavcodec/nvdec.c
+++ b/libavcodec/nvdec.c
@@ -53,6 +53,7 @@ static int map_avcodec_id(enum AVCodecID id)
{
switch (id) {
case AV_CODEC_ID_H264: return cudaVideoCodec_H264;
+ case AV_CODEC_ID_HEVC: return cudaVideoCodec_HEVC;
}
return -1;
}