X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=libavutil%2Fhwcontext_dxva2.c;h=33b3dc80ff6bba196a10ddaa2ee00c9f84a6975f;hb=7d09579190def3ef7562399489e628f3b65714ce;hp=4585f323bb61d2df27c9030ba56ee9201a44d3ce;hpb=398000abcf980d239a789da6f69811913d2fc635;p=ffmpeg diff --git a/libavutil/hwcontext_dxva2.c b/libavutil/hwcontext_dxva2.c index 4585f323bb6..33b3dc80ff6 100644 --- a/libavutil/hwcontext_dxva2.c +++ b/libavutil/hwcontext_dxva2.c @@ -124,7 +124,7 @@ static void dxva2_pool_release_dummy(void *opaque, uint8_t *data) // released in dxva2_frames_uninit() } -static AVBufferRef *dxva2_pool_alloc(void *opaque, int size) +static AVBufferRef *dxva2_pool_alloc(void *opaque, buffer_size_t size) { AVHWFramesContext *ctx = (AVHWFramesContext*)opaque; DXVA2FramesContext *s = ctx->internal->priv; @@ -348,7 +348,7 @@ static int dxva2_transfer_data_to(AVHWFramesContext *ctx, AVFrame *dst, if (ret < 0) goto fail; - av_image_copy(map->data, map->linesize, src->data, src->linesize, + av_image_copy(map->data, map->linesize, (const uint8_t **)src->data, src->linesize, ctx->sw_format, src->width, src->height); fail: @@ -379,7 +379,7 @@ static int dxva2_transfer_data_from(AVHWFramesContext *ctx, AVFrame *dst, dst_linesize[i] = dst->linesize[i]; src_linesize[i] = map->linesize[i]; } - av_image_copy_uc_from(dst->data, dst_linesize, map->data, src_linesize, + av_image_copy_uc_from(dst->data, dst_linesize, (const uint8_t **)map->data, src_linesize, ctx->sw_format, src->width, src->height); fail: av_frame_free(&map);