highperfocused/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge commit 'b08caa87c35a768ec0abb16b1e99c3a85f1df28e'

Browse Source 
* 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>
This commit is contained in:
Michael Niedermayer
2015-06-01 03:13:03 +02:00
parent d0d0913702 b08caa87c3
commit d8bbb99c51
9 changed files with 1512 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
libavcodec/allcodecs.c
View File

@@ -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);