diff options
| author | James Almer <jamrial@gmail.com> | 2017-11-10 20:38:36 -0300 |
|---|---|---|
| committer | James Almer <jamrial@gmail.com> | 2017-11-10 20:43:15 -0300 |
| commit | 1178babacaaad4e65fcb28af447afd586429c51a (patch) | |
| tree | b29b1aaba933e628c9363e1b5fcc32332224705b /libavcodec/Makefile | |
| parent | ec54df7dcd5935cc5efa6a25293b255a5d9a67f5 (diff) | |
| parent | b90fdb2c7199cc8b0e8d994fafba1fb4dc181d88 (diff) | |
| download | ffmpeg-1178babacaaad4e65fcb28af447afd586429c51a.tar.gz | |
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/Makefile')
| -rw-r--r-- | libavcodec/Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/libavcodec/Makefile b/libavcodec/Makefile index db1f70784a..7ac4e13a06 100644 --- a/libavcodec/Makefile +++ b/libavcodec/Makefile @@ -846,6 +846,7 @@ OBJS-$(CONFIG_H264_VDPAU_HWACCEL) += vdpau_h264.o OBJS-$(CONFIG_H264_VIDEOTOOLBOX_HWACCEL) += videotoolbox.o OBJS-$(CONFIG_HEVC_D3D11VA_HWACCEL) += dxva2_hevc.o OBJS-$(CONFIG_HEVC_DXVA2_HWACCEL) += dxva2_hevc.o +OBJS-$(CONFIG_HEVC_NVDEC_HWACCEL) += nvdec_hevc.o OBJS-$(CONFIG_HEVC_QSV_HWACCEL) += qsvdec_h2645.o OBJS-$(CONFIG_HEVC_VAAPI_HWACCEL) += vaapi_hevc.o OBJS-$(CONFIG_HEVC_VDPAU_HWACCEL) += vdpau_hevc.o |