Revert "Merge commit 'b08caa87c3'"

This reverts commit d8bbb99c51, reversing
changes made to d0d0913702.

Signed-off-by: Philip Langdale <philipl@overt.org>
This commit is contained in:
Philip Langdale 2015-06-06 10:41:34 -07:00
parent 58b49f78cf
commit d47de79372
9 changed files with 6 additions and 1512 deletions

View file

@ -563,9 +563,7 @@ 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);