From 9b749c8274f6b6f35dde2cf29b99fa4f719abf87 Mon Sep 17 00:00:00 2001 From: Vittorio Giovara Date: Wed, 12 Mar 2014 09:13:07 +0100 Subject: h264: move relevant fields from Picture to H264Picture --- libavcodec/vdpau_h264.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'libavcodec/vdpau_h264.c') diff --git a/libavcodec/vdpau_h264.c b/libavcodec/vdpau_h264.c index 3e84644990..6374e04e9e 100644 --- a/libavcodec/vdpau_h264.c +++ b/libavcodec/vdpau_h264.c @@ -46,7 +46,7 @@ static void vdpau_h264_clear_rf(VdpReferenceFrameH264 *rf) rf->frame_idx = 0; } -static void vdpau_h264_set_rf(VdpReferenceFrameH264 *rf, Picture *pic, +static void vdpau_h264_set_rf(VdpReferenceFrameH264 *rf, H264Picture *pic, int pic_structure) { VdpVideoSurface surface = ff_vdpau_get_surface_id(pic); @@ -74,11 +74,11 @@ static void vdpau_h264_set_reference_frames(AVCodecContext *avctx) #define H264_RF_COUNT FF_ARRAY_ELEMS(info->referenceFrames) for (list = 0; list < 2; ++list) { - Picture **lp = list ? h->long_ref : h->short_ref; + H264Picture **lp = list ? h->long_ref : h->short_ref; int i, ls = list ? 16 : h->short_ref_count; for (i = 0; i < ls; ++i) { - Picture *pic = lp[i]; + H264Picture *pic = lp[i]; VdpReferenceFrameH264 *rf2; VdpVideoSurface surface_ref; int pic_frame_idx; @@ -118,7 +118,7 @@ static int vdpau_h264_start_frame(AVCodecContext *avctx, const uint8_t *buffer, uint32_t size) { H264Context * const h = avctx->priv_data; - Picture *pic = h->cur_pic_ptr; + H264Picture *pic = h->cur_pic_ptr; struct vdpau_picture_context *pic_ctx = pic->hwaccel_picture_private; VdpPictureInfoH264 *info = &pic_ctx->info.h264; @@ -170,7 +170,7 @@ static int vdpau_h264_decode_slice(AVCodecContext *avctx, const uint8_t *buffer, uint32_t size) { H264Context *h = avctx->priv_data; - Picture *pic = h->cur_pic_ptr; + H264Picture *pic = h->cur_pic_ptr; struct vdpau_picture_context *pic_ctx = pic->hwaccel_picture_private; int val; @@ -190,7 +190,7 @@ static int vdpau_h264_end_frame(AVCodecContext *avctx) { AVVDPAUContext *hwctx = avctx->hwaccel_context; H264Context *h = avctx->priv_data; - Picture *pic = h->cur_pic_ptr; + H264Picture *pic = h->cur_pic_ptr; struct vdpau_picture_context *pic_ctx = pic->hwaccel_picture_private; VdpVideoSurface surf = ff_vdpau_get_surface_id(pic); -- cgit v1.2.3