]> git.sesse.net Git - ffmpeg/commitdiff
avcodec/nvenc: twopass mode works in all modes
authorTimo Rothenpieler <timo@rothenpieler.org>
Tue, 31 May 2016 14:55:24 +0000 (16:55 +0200)
committerTimo Rothenpieler <timo@rothenpieler.org>
Tue, 31 May 2016 14:55:24 +0000 (16:55 +0200)
libavcodec/nvenc.c

index 14ed0d22e60127bb50276a7a4285a862f0a28335..f440f5a41fe2f67435460f55ac981ad77bc8d537 100644 (file)
@@ -598,15 +598,9 @@ static void nvenc_override_rate_control(AVCodecContext *avctx)
         set_vbr(avctx);
         break;
     case NV_ENC_PARAMS_RC_CBR:
-        break;
     case NV_ENC_PARAMS_RC_2_PASS_QUALITY:
     case NV_ENC_PARAMS_RC_2_PASS_FRAMESIZE_CAP:
-        if (!(ctx->flags & NVENC_LOWLATENCY)) {
-            av_log(avctx, AV_LOG_WARNING,
-                   "The multipass rate-control requires "
-                   "a low-latency preset.\n");
-            return;
-        }
+        break;
     }
 
     rc->rateControlMode = ctx->rc;