[FFmpeg-cvslog] avcodec/nvenc: don't set profile in lossless mode

Timo Rothenpieler git at videolan.org
Fri May 6 10:27:47 CEST 2016


ffmpeg | branch: master | Timo Rothenpieler <timo at rothenpieler.org> | Thu May  5 18:05:05 2016 +0200| [31ce01bdb9722a552d5b316d97aa6e294de0c7cc] | committer: Timo Rothenpieler

avcodec/nvenc: don't set profile in lossless mode

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=31ce01bdb9722a552d5b316d97aa6e294de0c7cc
---

 libavcodec/nvenc.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/libavcodec/nvenc.c b/libavcodec/nvenc.c
index c9b4048..bcafc20 100644
--- a/libavcodec/nvenc.c
+++ b/libavcodec/nvenc.c
@@ -890,7 +890,7 @@ static av_cold int nvenc_encode_init(AVCodecContext *avctx)
 
         ctx->encode_config.encodeCodecConfig.h264Config.outputAUD = 1;
 
-        if (!ctx->profile) {
+        if (!ctx->profile && !lossless) {
             switch (avctx->profile) {
             case FF_PROFILE_H264_HIGH_444_PREDICTIVE:
                 ctx->encode_config.profileGUID = NV_ENC_H264_PROFILE_HIGH_444_GUID;
@@ -910,7 +910,7 @@ static av_cold int nvenc_encode_init(AVCodecContext *avctx)
                 ctx->encode_config.profileGUID = NV_ENC_H264_PROFILE_HIGH_GUID;
                 break;
             }
-        } else {
+        } else if(!lossless) {
             if (!strcmp(ctx->profile, "high")) {
                 ctx->encode_config.profileGUID = NV_ENC_H264_PROFILE_HIGH_GUID;
                 avctx->profile = FF_PROFILE_H264_HIGH;



More information about the ffmpeg-cvslog mailing list