diff --git a/libavcodec/nvenc.c b/libavcodec/nvenc.c
index 984dd3bc3f..5634d8d57a 100644
--- a/libavcodec/nvenc.c
+++ b/libavcodec/nvenc.c
@@ -974,8 +974,8 @@ static av_cold int nvenc_alloc_surface(AVCodecContext *avctx, int idx)
     } else {
         NV_ENC_CREATE_INPUT_BUFFER allocSurf = { 0 };
         allocSurf.version = NV_ENC_CREATE_INPUT_BUFFER_VER;
-        allocSurf.width = (avctx->width + 31) & ~31;
-        allocSurf.height = (avctx->height + 31) & ~31;
+        allocSurf.width = avctx->width;
+        allocSurf.height = avctx->height;
         allocSurf.memoryHeap = NV_ENC_MEMORY_HEAP_SYSMEM_CACHED;
         allocSurf.bufferFmt = ctx->surfaces[idx].format;
 
@@ -1609,8 +1609,8 @@ int ff_nvenc_encode_frame(AVCodecContext *avctx, AVPacket *pkt,
 
         pic_params.inputBuffer = inSurf->input_surface;
         pic_params.bufferFmt = inSurf->format;
-        pic_params.inputWidth = avctx->width;
-        pic_params.inputHeight = avctx->height;
+        pic_params.inputWidth = inSurf->width;
+        pic_params.inputHeight = inSurf->height;
         pic_params.outputBitstream = inSurf->output_surface;
 
         if (avctx->flags & AV_CODEC_FLAG_INTERLACED_DCT) {