[FFmpeg-cvslog] avcodec/nvenc: twopass mode works in all modes

[Timo Rothenpieler]

ffmpeg | branch: master | Timo Rothenpieler <timo at rothenpieler.org> | Tue May 31 16:55:24 2016 +0200| [eae4eba9cbe1b5ffc97b92e671bd7cd024839322] | committer: Timo Rothenpieler

avcodec/nvenc: twopass mode works in all modes

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=eae4eba9cbe1b5ffc97b92e671bd7cd024839322
---

 libavcodec/nvenc.c |    8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/libavcodec/nvenc.c b/libavcodec/nvenc.c
index 14ed0d2..f440f5a 100644
--- a/libavcodec/nvenc.c
+++ b/libavcodec/nvenc.c
@@ -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;