diff options
| author | Timo Rothenpieler <timo@rothenpieler.org> | 2016-06-25 22:24:13 +0200 |
|---|---|---|
| committer | Timo Rothenpieler <timo@rothenpieler.org> | 2016-06-25 23:05:17 +0200 |
| commit | 888a5c794778a2f2aad22e9b4a3952dff92b11fa (patch) | |
| tree | 166aa2d553bb1e33fc64ecda29e8de21d1c35507 /libavcodec/allcodecs.c | |
| parent | 6ee7adb881e4513ebacf76ba97d413fcbd6cf3e3 (diff) | |
avcodec/nvenc: Bring encoder names in line with other encoders
Diffstat (limited to 'libavcodec/allcodecs.c')
| -rw-r--r-- | libavcodec/allcodecs.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/libavcodec/allcodecs.c b/libavcodec/allcodecs.c index 36a0de0906..02fc834e6f 100644 --- a/libavcodec/allcodecs.c +++ b/libavcodec/allcodecs.c @@ -623,14 +623,18 @@ void avcodec_register_all(void) * above is available */ REGISTER_ENCODER(LIBOPENH264, libopenh264); REGISTER_DECODER(H264_CUVID, h264_cuvid); + REGISTER_ENCODER(H264_NVENC, h264_nvenc); + REGISTER_ENCODER(H264_OMX, h264_omx); REGISTER_ENCODER(H264_QSV, h264_qsv); REGISTER_ENCODER(H264_VAAPI, h264_vaapi); REGISTER_ENCODER(H264_VIDEOTOOLBOX, h264_videotoolbox); +#if FF_API_NVENC_OLD_NAME REGISTER_ENCODER(NVENC, nvenc); - REGISTER_ENCODER(H264_OMX, h264_omx); REGISTER_ENCODER(NVENC_H264, nvenc_h264); REGISTER_ENCODER(NVENC_HEVC, nvenc_hevc); +#endif REGISTER_DECODER(HEVC_CUVID, hevc_cuvid); + REGISTER_ENCODER(HEVC_NVENC, hevc_nvenc); REGISTER_ENCODER(HEVC_QSV, hevc_qsv); REGISTER_ENCODER(HEVC_VAAPI, hevc_vaapi); REGISTER_ENCODER(LIBKVAZAAR, libkvazaar); |