aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec
diff options
context:
space:
mode:
authorTimo Rothenpieler <timo@rothenpieler.org>2017-05-23 11:24:40 +0200
committerTimo Rothenpieler <timo@rothenpieler.org>2017-05-23 11:59:21 +0200
commit1f76235dd45051cd3eedbe531065931ef917c40e (patch)
tree3afaacd5d2e62c6a09f554b34eb994d89500dc40 /libavcodec
parent7793fc5b339df0661c2cddcdc647e4641eaf83e9 (diff)
downloadffmpeg-1f76235dd45051cd3eedbe531065931ef917c40e.tar.gz
avcodec/nvenc: remove unnecessary alignment
Fixes #6260
Diffstat (limited to 'libavcodec')
-rw-r--r--libavcodec/nvenc.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/libavcodec/nvenc.c b/libavcodec/nvenc.c
index 2505c3d1e3..ec980ebad6 100644
--- a/libavcodec/nvenc.c
+++ b/libavcodec/nvenc.c
@@ -1118,8 +1118,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;
@@ -1729,8 +1729,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.inputPitch = inSurf->pitch;
pic_params.outputBitstream = inSurf->output_surface;