diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-06-01 04:13:03 +0300 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-06-01 04:13:55 +0300 |
| commit | d8bbb99c51af08c76dd0a66588fecc5c0106844d (patch) | |
| tree | 1ae5c4fe51229b48f476c7452304c1b91bcb4282 /libavcodec/allcodecs.c | |
| parent | d0d0913702358c61dfb9c5ac8b141cd203524869 (diff) | |
| parent | b08caa87c35a768ec0abb16b1e99c3a85f1df28e (diff) | |
Merge commit 'b08caa87c35a768ec0abb16b1e99c3a85f1df28e'
* commit 'b08caa87c35a768ec0abb16b1e99c3a85f1df28e':
nvenc: H264 and HEVC encoders
Conflicts:
Changelog
configure
libavcodec/Makefile
libavcodec/version.h
This implementation is merged under the name nvenc_b*
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/allcodecs.c')
| -rw-r--r-- | libavcodec/allcodecs.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/libavcodec/allcodecs.c b/libavcodec/allcodecs.c index a94d1dc8f6..197188009d 100644 --- a/libavcodec/allcodecs.c +++ b/libavcodec/allcodecs.c @@ -563,7 +563,9 @@ void avcodec_register_all(void) /* external libraries, that shouldn't be used by default if one of the * above is available */ REGISTER_ENCODER(LIBOPENH264, libopenh264); + REGISTER_ENCODER(H264_NVENC, h264_nvenc); REGISTER_ENCODER(H264_QSV, h264_qsv); + REGISTER_ENCODER(HEVC_NVENC, hevc_nvenc); /* parsers */ REGISTER_PARSER(AAC, aac); |