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

This commit is contained in:
Timo Rothenpieler 2016-05-05 18:05:05 +02:00
parent bd63ecec78
commit 31ce01bdb9

View File

@ -890,7 +890,7 @@ static av_cold int nvenc_encode_init(AVCodecContext *avctx)
ctx->encode_config.encodeCodecConfig.h264Config.outputAUD = 1; ctx->encode_config.encodeCodecConfig.h264Config.outputAUD = 1;
if (!ctx->profile) { if (!ctx->profile && !lossless) {
switch (avctx->profile) { switch (avctx->profile) {
case FF_PROFILE_H264_HIGH_444_PREDICTIVE: case FF_PROFILE_H264_HIGH_444_PREDICTIVE:
ctx->encode_config.profileGUID = NV_ENC_H264_PROFILE_HIGH_444_GUID; 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; ctx->encode_config.profileGUID = NV_ENC_H264_PROFILE_HIGH_GUID;
break; break;
} }
} else { } else if(!lossless) {
if (!strcmp(ctx->profile, "high")) { if (!strcmp(ctx->profile, "high")) {
ctx->encode_config.profileGUID = NV_ENC_H264_PROFILE_HIGH_GUID; ctx->encode_config.profileGUID = NV_ENC_H264_PROFILE_HIGH_GUID;
avctx->profile = FF_PROFILE_H264_HIGH; avctx->profile = FF_PROFILE_H264_HIGH;