From 1b1094a19d9e41baf3253c83841f9e5343cecbd0 Mon Sep 17 00:00:00 2001 From: wm4 Date: Thu, 20 Mar 2014 08:53:17 +0100 Subject: vdpau: switch ff_vdpau_get_surface_id from Picture to AVFrame This gets rid of aliasing completely unrelated structs to Picture. Fixes the remaining compilation warnings in the vdpau code. Signed-off-by: Anton Khirnov --- libavcodec/vdpau_vc1.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'libavcodec/vdpau_vc1.c') diff --git a/libavcodec/vdpau_vc1.c b/libavcodec/vdpau_vc1.c index 01ad0aebac..392c511ac8 100644 --- a/libavcodec/vdpau_vc1.c +++ b/libavcodec/vdpau_vc1.c @@ -44,12 +44,12 @@ static int vdpau_vc1_start_frame(AVCodecContext *avctx, switch (s->pict_type) { case AV_PICTURE_TYPE_B: - ref = ff_vdpau_get_surface_id(&s->next_picture); + ref = ff_vdpau_get_surface_id(&s->next_picture.f); assert(ref != VDP_INVALID_HANDLE); info->backward_reference = ref; /* fall-through */ case AV_PICTURE_TYPE_P: - ref = ff_vdpau_get_surface_id(&s->last_picture); + ref = ff_vdpau_get_surface_id(&s->last_picture.f); assert(ref != VDP_INVALID_HANDLE); info->forward_reference = ref; } -- cgit v1.2.3