diff options
| author | Philip Langdale <philipl@overt.org> | 2015-06-06 13:21:56 -0700 |
|---|---|---|
| committer | Philip Langdale <philipl@overt.org> | 2015-06-06 20:29:17 -0700 |
| commit | cc904353fa9ad1b81f22339dc0e762505151cb82 (patch) | |
| tree | cd9ebbca1f53623fab5f12db7184e7d4b3f0e5ed | |
| parent | 42db4aaaa6e49608b78db01f2698e1120b491fdb (diff) | |
| download | ffmpeg-cc904353fa9ad1b81f22339dc0e762505151cb82.tar.gz | |
avcodec/allcodecs: Re-order nvenc encoders below x264/5.
We shouldn't pick nvenc by default.
Signed-off-by: Philip Langdale <philipl@overt.org>
| -rw-r--r-- | libavcodec/allcodecs.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libavcodec/allcodecs.c b/libavcodec/allcodecs.c index 4cc93aae47..ce977467f9 100644 --- a/libavcodec/allcodecs.c +++ b/libavcodec/allcodecs.c @@ -235,9 +235,6 @@ void avcodec_register_all(void) REGISTER_DECODER(MVC2, mvc2); REGISTER_DECODER(MXPEG, mxpeg); REGISTER_DECODER(NUV, nuv); - REGISTER_ENCODER(NVENC, nvenc); - REGISTER_ENCODER(NVENC_H264, nvenc_h264); - REGISTER_ENCODER(NVENC_HEVC, nvenc_hevc); REGISTER_DECODER(PAF_VIDEO, paf_video); REGISTER_ENCDEC (PAM, pam); REGISTER_ENCDEC (PBM, pbm); @@ -565,6 +562,9 @@ void avcodec_register_all(void) * above is available */ REGISTER_ENCODER(LIBOPENH264, libopenh264); REGISTER_ENCODER(H264_QSV, h264_qsv); + REGISTER_ENCODER(NVENC, nvenc); + REGISTER_ENCODER(NVENC_H264, nvenc_h264); + REGISTER_ENCODER(NVENC_HEVC, nvenc_hevc); /* parsers */ REGISTER_PARSER(AAC, aac); |