[FFmpeg-cvslog] avcodec/allcodecs: Re-order nvenc encoders below x264/5.
Philip Langdale
git at videolan.org
Sun Jun 7 05:29:45 CEST 2015
ffmpeg | branch: master | Philip Langdale <philipl at overt.org> | Sat Jun 6 13:21:56 2015 -0700| [cc904353fa9ad1b81f22339dc0e762505151cb82] | committer: Philip Langdale
avcodec/allcodecs: Re-order nvenc encoders below x264/5.
We shouldn't pick nvenc by default.
Signed-off-by: Philip Langdale <philipl at overt.org>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=cc904353fa9ad1b81f22339dc0e762505151cb82
---
libavcodec/allcodecs.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/libavcodec/allcodecs.c b/libavcodec/allcodecs.c
index 4cc93aa..ce97746 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);
More information about the ffmpeg-cvslog
mailing list