generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge commit '66acb76bb0492b263215ca9b4d927a7be39ace02'

Browse Source 
* commit '66acb76bb0492b263215ca9b4d927a7be39ace02':
  lavc: add Intel libmfx-based HEVC encoder

Conflicts:
	Changelog
	configure
	libavcodec/Makefile
	libavcodec/allcodecs.c
	libavcodec/qsv.c
	libavcodec/qsvenc.c
	libavcodec/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer
2015-07-09 11:52:05 +02:00
parent 587980eb7a 66acb76bb0
commit 7871eb4361
13 changed files with 476 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
libavcodec/allcodecs.c
View File

@@ -569,6 +569,7 @@ void avcodec_register_all(void)
REGISTER_ENCODER(NVENC, nvenc);
REGISTER_ENCODER(NVENC_H264, nvenc_h264);
REGISTER_ENCODER(NVENC_HEVC, nvenc_hevc);
REGISTER_ENCODER(HEVC_QSV, hevc_qsv);
REGISTER_ENCODER(MPEG2_QSV, mpeg2_qsv);
/* parsers */