History

avcodec/nvenc: Bring encoder names in line with other encoders

Timo Rothenpieler committed 10 years ago

Commit 888a5c71 parent 6ee7adb6 files · +89 −12Browse files

Showing the changes to libavcodec/allcodecs.c (1 of 6 files). Show all

Unified · Split

libavcodec/allcodecs.c+5−1
@@ -623,14 +623,18 @@ void avcodec_register_all(void) · 622 unmodified lines
623 * above is available */623 * above is available */
624 REGISTER_ENCODER(LIBOPENH264, libopenh264);624 REGISTER_ENCODER(LIBOPENH264, libopenh264);
625 REGISTER_DECODER(H264_CUVID, h264_cuvid);625 REGISTER_DECODER(H264_CUVID, h264_cuvid);
626 REGISTER_ENCODER(H264_NVENC, h264_nvenc);
627 REGISTER_ENCODER(H264_OMX, h264_omx);
626 REGISTER_ENCODER(H264_QSV, h264_qsv);628 REGISTER_ENCODER(H264_QSV, h264_qsv);
627 REGISTER_ENCODER(H264_VAAPI, h264_vaapi);629 REGISTER_ENCODER(H264_VAAPI, h264_vaapi);
628 REGISTER_ENCODER(H264_VIDEOTOOLBOX, h264_videotoolbox);630 REGISTER_ENCODER(H264_VIDEOTOOLBOX, h264_videotoolbox);
631#if FF_API_NVENC_OLD_NAME
629 REGISTER_ENCODER(NVENC, nvenc);632 REGISTER_ENCODER(NVENC, nvenc);
630 REGISTER_ENCODER(H264_OMX, h264_omx);
631 REGISTER_ENCODER(NVENC_H264, nvenc_h264);633 REGISTER_ENCODER(NVENC_H264, nvenc_h264);
632 REGISTER_ENCODER(NVENC_HEVC, nvenc_hevc);634 REGISTER_ENCODER(NVENC_HEVC, nvenc_hevc);
635#endif
633 REGISTER_DECODER(HEVC_CUVID, hevc_cuvid);636 REGISTER_DECODER(HEVC_CUVID, hevc_cuvid);
637 REGISTER_ENCODER(HEVC_NVENC, hevc_nvenc);
634 REGISTER_ENCODER(HEVC_QSV, hevc_qsv);638 REGISTER_ENCODER(HEVC_QSV, hevc_qsv);
635 REGISTER_ENCODER(HEVC_VAAPI, hevc_vaapi);639 REGISTER_ENCODER(HEVC_VAAPI, hevc_vaapi);
636 REGISTER_ENCODER(LIBKVAZAAR, libkvazaar);640 REGISTER_ENCODER(LIBKVAZAAR, libkvazaar);

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t