summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTimo Rothenpieler <timo@rothenpieler.org>2016-09-29 18:56:39 +0200
committerTimo Rothenpieler <timo@rothenpieler.org>2016-09-29 22:58:34 +0200
commitf0ea96d8a2c902455bf0df1aa02deecceccfe930 (patch)
tree81c650a1355e3ea93e7f419737549bfbc17a858e
parent81bab1074ff9071ea0c5ed91ae10e9e1b6e9ad30 (diff)
avcodec/cuvid: use actual frame size for buffer allocation
-rw-r--r--libavcodec/cuvid.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/libavcodec/cuvid.c b/libavcodec/cuvid.c
index bd66f9ed14..faef711987 100644
--- a/libavcodec/cuvid.c
+++ b/libavcodec/cuvid.c
@@ -199,8 +199,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->coded_width, 32);
- hwframe_ctx->height = FFALIGN(avctx->coded_height, 32);
+ hwframe_ctx->width = FFALIGN(avctx->width, 32);
+ hwframe_ctx->height = FFALIGN(avctx->height, 32);
if ((ctx->internal_error = av_hwframe_ctx_init(ctx->hwframe)) < 0) {
av_log(avctx, AV_LOG_ERROR, "av_hwframe_ctx_init failed\n");
@@ -397,7 +397,7 @@ static int cuvid_output_frame(AVCodecContext *avctx, AVFrame *frame)
.dstPitch = frame->linesize[i],
.srcY = offset,
.WidthInBytes = FFMIN(pitch, frame->linesize[i]),
- .Height = avctx->coded_height >> (i ? 1 : 0),
+ .Height = avctx->height >> (i ? 1 : 0),
};
ret = CHECK_CU(cuMemcpy2D(&cpy));