summaryrefslogtreecommitdiff
path: root/libavcodec/nvenc.c
diff options
context:
space:
mode:
authorTimo Rothenpieler <timo@rothenpieler.org>2016-05-05 18:05:05 +0200
committerTimo Rothenpieler <timo@rothenpieler.org>2016-05-06 10:15:29 +0200
commit31ce01bdb9722a552d5b316d97aa6e294de0c7cc (patch)
treedb69cad9bdbd219cd909940d4969c514e1ce130a /libavcodec/nvenc.c
parentbd63ecec78207c3c8d3b377c37aa81f56f30a761 (diff)
avcodec/nvenc: don't set profile in lossless mode
Diffstat (limited to 'libavcodec/nvenc.c')
-rw-r--r--libavcodec/nvenc.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/nvenc.c b/libavcodec/nvenc.c
index c9b40485e7..bcafc20c03 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;