summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTimo Rothenpieler <timo@rothenpieler.org>2016-10-04 12:58:42 +0200
committerTimo Rothenpieler <timo@rothenpieler.org>2016-10-04 12:58:42 +0200
commit5d4fea88d485ec6e81db85ff3e0c6e1ab01d3436 (patch)
tree3807f09d963d41cb5d71c4a93db0ef679bdd8a48
parent14fe54bbfb988f4f5a6acb358282640a13162311 (diff)
downloadffmpeg-5d4fea88d485ec6e81db85ff3e0c6e1ab01d3436.tar.gz
avcodec/cuvid: don't align frame size
hwcontext_cuda was changed to take care of proper alignment internally
-rw-r--r--libavcodec/cuvid.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/cuvid.c b/libavcodec/cuvid.c
index e9a1dd75df..56f349cdd2 100644
--- a/libavcodec/cuvid.c
+++ b/libavcodec/cuvid.c
@@ -204,8 +204,8 @@ static int CUDAAPI cuvid_handle_video_sequence(void *opaque, CUVIDEOFORMAT* form
if (!hwframe_ctx->pool) {
hwframe_ctx->format = AV_PIX_FMT_CUDA;
hwframe_ctx->sw_format = AV_PIX_FMT_NV12;
- hwframe_ctx->width = FFALIGN(avctx->width, 32);
- hwframe_ctx->height = FFALIGN(avctx->height, 32);
+ hwframe_ctx->width = avctx->width;
+ hwframe_ctx->height = avctx->height;
if ((ctx->internal_error = av_hwframe_ctx_init(ctx->hwframe)) < 0) {
av_log(avctx, AV_LOG_ERROR, "av_hwframe_ctx_init failed\n");