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

Timo Rothenpieler committed 10 years ago

Commit 31ce01b1 parent bd63ece1 file · +2 −2Browse files

Unified · Split

libavcodec/nvenc.c+2−2

@@ -890,7 +890,7 @@ static av_cold int nvenc_encode_init(AVCodecContext *avctx) · 889 unmodified lines
890		890
891	ctx->encode_config.encodeCodecConfig.h264Config.outputAUD = 1;	891	ctx->encode_config.encodeCodecConfig.h264Config.outputAUD = 1;
892		892
893	if (!ctx->profile) {	893	if (!ctx->profile && !lossless) {
894	switch (avctx->profile) {	894	switch (avctx->profile) {
895	case FF_PROFILE_H264_HIGH_444_PREDICTIVE:	895	case FF_PROFILE_H264_HIGH_444_PREDICTIVE:
896	ctx->encode_config.profileGUID = NV_ENC_H264_PROFILE_HIGH_444_GUID;	896	ctx->encode_config.profileGUID = NV_ENC_H264_PROFILE_HIGH_444_GUID;
@@ -910,7 +910,7 @@ static av_cold int nvenc_encode_init(AVCodecContext *avctx) · 13 unmodified lines
910	ctx->encode_config.profileGUID = NV_ENC_H264_PROFILE_HIGH_GUID;	910	ctx->encode_config.profileGUID = NV_ENC_H264_PROFILE_HIGH_GUID;
911	break;	911	break;
912	}	912	}
913	} else {	913	} else if(!lossless) {
914	if (!strcmp(ctx->profile, "high")) {	914	if (!strcmp(ctx->profile, "high")) {
915	ctx->encode_config.profileGUID = NV_ENC_H264_PROFILE_HIGH_GUID;	915	ctx->encode_config.profileGUID = NV_ENC_H264_PROFILE_HIGH_GUID;
916	avctx->profile = FF_PROFILE_H264_HIGH;	916	avctx->profile = FF_PROFILE_H264_HIGH;