From 4600a85eaa6182e5a27464f6b9cae5a9ddbf3098 Mon Sep 17 00:00:00 2001 From: Diego Biurrun Date: Fri, 15 Aug 2014 20:51:01 +0200 Subject: dxva2: Pass variable of correct type to IDirectXVideoDecoder_GetBuffer() This avoids related incompatible pointer type warnings. --- libavcodec/dxva2_h264.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'libavcodec/dxva2_h264.c') diff --git a/libavcodec/dxva2_h264.c b/libavcodec/dxva2_h264.c index fa205c42d7..4132cd7ed9 100644 --- a/libavcodec/dxva2_h264.c +++ b/libavcodec/dxva2_h264.c @@ -297,6 +297,7 @@ static int commit_bitstream_and_slice_buffer(AVCodecContext *avctx, const H264Picture *current_picture = h->cur_pic_ptr; struct dxva2_picture_context *ctx_pic = current_picture->hwaccel_picture_private; DXVA_Slice_H264_Short *slice = NULL; + void *dxva_data_ptr; uint8_t *dxva_data, *current, *end; unsigned dxva_size; void *slice_data; @@ -306,9 +307,11 @@ static int commit_bitstream_and_slice_buffer(AVCodecContext *avctx, /* Create an annex B bitstream buffer with only slice NAL and finalize slice */ if (FAILED(IDirectXVideoDecoder_GetBuffer(ctx->decoder, - DXVA2_BitStreamDateBufferType, - &dxva_data, &dxva_size))) + DXVA2_BitStreamDateBufferType, + &dxva_data_ptr, &dxva_size))) return -1; + + dxva_data = dxva_data_ptr; current = dxva_data; end = dxva_data + dxva_size; -- cgit v1.2.3