Re: [FFmpeg-devel] [PATCH] avcodec/allcodecs: Re-order nvenc encoders below x264/5.

2015-06-06 Thread Philip Langdale 
On Sun, 7 Jun 2015 00:12:18 +0200
Michael Niedermayer  wrote:

> On Sat, Jun 06, 2015 at 01:22:45PM -0700, Philip Langdale wrote:
> > We shouldn't pick nvenc by default.
> > 
> > Signed-off-by: Philip Langdale 
> > ---
> >  libavcodec/allcodecs.c | 6 +++---
> >  1 file changed, 3 insertions(+), 3 deletions(-)
> 
> LGTM
> 
> thanks
> 
> [...]

Pushed

--phil
___
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-devel

Re: [FFmpeg-devel] [PATCH] avcodec/allcodecs: Re-order nvenc encoders below x264/5.

2015-06-06 Thread Michael Niedermayer 
On Sat, Jun 06, 2015 at 01:22:45PM -0700, Philip Langdale wrote:
> We shouldn't pick nvenc by default.
> 
> Signed-off-by: Philip Langdale 
> ---
>  libavcodec/allcodecs.c | 6 +++---
>  1 file changed, 3 insertions(+), 3 deletions(-)

LGTM

thanks

[...]
-- 
Michael GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB

Everything should be made as simple as possible, but not simpler.
-- Albert Einstein


signature.asc
Description: Digital signature
___
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-devel

[FFmpeg-devel] [PATCH] avcodec/allcodecs: Re-order nvenc encoders below x264/5.

2015-06-06 Thread Philip Langdale 
We shouldn't pick nvenc by default.

Signed-off-by: Philip Langdale 
---
 libavcodec/allcodecs.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/libavcodec/allcodecs.c b/libavcodec/allcodecs.c
index 159d842..6a91d64 100644
--- a/libavcodec/allcodecs.c
+++ b/libavcodec/allcodecs.c
@@ -236,9 +236,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);
@@ -566,6 +563,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);
-- 
2.1.4

___
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-devel