eden-emu/FFmpeg
20
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge commit '3a85397e8b'

Browse source 
* commit '3a85397e8b':
  lavc: add Intel libmfx-based MPEG2 encoder

Conflicts:
	Changelog
	configure
	libavcodec/allcodecs.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2015-07-09 11:17:12 +02:00
commit 96ee6b9962
6 changed files with 127 additions and 4 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(MPEG2_QSV, mpeg2_qsv);
/* parsers */
REGISTER_PARSER(AAC, aac);