History

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
890890
891891 ctx->encode_config.encodeCodecConfig.h264Config.outputAUD = 1;
892892
893− if (!ctx->profile) {
893+ if (!ctx->profile && !lossless) {
894894 switch (avctx->profile) {
895895 case FF_PROFILE_H264_HIGH_444_PREDICTIVE:
896896 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
910910 ctx->encode_config.profileGUID = NV_ENC_H264_PROFILE_HIGH_GUID;
911911 break;
912912 }
913− } else {
913+ } else if(!lossless) {
914914 if (!strcmp(ctx->profile, "high")) {
915915 ctx->encode_config.profileGUID = NV_ENC_H264_PROFILE_HIGH_GUID;
916916 avctx->profile = FF_PROFILE_H264_HIGH;

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t