diff options
| author | Philip Langdale <philipl@overt.org> | 2015-06-06 10:41:34 -0700 |
|---|---|---|
| committer | Philip Langdale <philipl@overt.org> | 2015-06-06 13:14:02 -0700 |
| commit | d47de79372d374ae106c65c3f313600c83e2afc8 (patch) | |
| tree | 9466c6b0b4b9229052c0353775ef5ed528599ef1 /libavcodec/allcodecs.c | |
| parent | 58b49f78cf346734c22141003de50e6de9b5ed4e (diff) | |
| download | ffmpeg-d47de79372d374ae106c65c3f313600c83e2afc8.tar.gz | |
Revert "Merge commit 'b08caa87c35a768ec0abb16b1e99c3a85f1df28e'"
This reverts commit d8bbb99c51af08c76dd0a66588fecc5c0106844d, reversing
changes made to d0d0913702358c61dfb9c5ac8b141cd203524869.
Signed-off-by: Philip Langdale <philipl@overt.org>
Diffstat (limited to 'libavcodec/allcodecs.c')
| -rw-r--r-- | libavcodec/allcodecs.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/libavcodec/allcodecs.c b/libavcodec/allcodecs.c index 197188009d..a94d1dc8f6 100644 --- a/libavcodec/allcodecs.c +++ b/libavcodec/allcodecs.c @@ -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); |