From 36ad2b3ee014cac0f2d688dc9ef8cc92e07f73c8 Mon Sep 17 00:00:00 2001 From: Gwenole Beauchesne Date: Mon, 28 Dec 2009 09:02:16 +0000 Subject: [PATCH] Rename ff_vaapi_get_surface() to ff_vaapi_get_surface_id(). Originally committed as revision 20941 to svn://svn.ffmpeg.org/ffmpeg/trunk --- libavcodec/vaapi.c | 2 +- libavcodec/vaapi_internal.h | 2 +- libavcodec/vaapi_mpeg2.c | 4 ++-- libavcodec/vaapi_mpeg4.c | 4 ++-- libavcodec/vaapi_vc1.c | 4 ++-- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/libavcodec/vaapi.c b/libavcodec/vaapi.c index be73d0fea66..7912198e5d6 100644 --- a/libavcodec/vaapi.c +++ b/libavcodec/vaapi.c @@ -185,7 +185,7 @@ int ff_vaapi_common_end_frame(MpegEncContext *s) if (commit_slices(vactx) < 0) goto done; if (vactx->n_slice_buf_ids > 0) { - if (render_picture(vactx, ff_vaapi_get_surface(s->current_picture_ptr)) < 0) + if (render_picture(vactx, ff_vaapi_get_surface_id(s->current_picture_ptr)) < 0) goto done; ff_draw_horiz_band(s, 0, s->avctx->height); } diff --git a/libavcodec/vaapi_internal.h b/libavcodec/vaapi_internal.h index bfc0f80162b..2283980a247 100644 --- a/libavcodec/vaapi_internal.h +++ b/libavcodec/vaapi_internal.h @@ -36,7 +36,7 @@ */ /** Extract VASurfaceID from a Picture */ -static inline VASurfaceID ff_vaapi_get_surface(Picture *pic) +static inline VASurfaceID ff_vaapi_get_surface_id(Picture *pic) { return (uintptr_t)pic->data[3]; } diff --git a/libavcodec/vaapi_mpeg2.c b/libavcodec/vaapi_mpeg2.c index fbc99ae9706..b6bd6fdb134 100644 --- a/libavcodec/vaapi_mpeg2.c +++ b/libavcodec/vaapi_mpeg2.c @@ -73,10 +73,10 @@ static int vaapi_mpeg2_start_frame(AVCodecContext *avctx, av_unused const uint8_ switch (s->pict_type) { case FF_B_TYPE: - pic_param->backward_reference_picture = ff_vaapi_get_surface(&s->next_picture); + pic_param->backward_reference_picture = ff_vaapi_get_surface_id(&s->next_picture); // fall-through case FF_P_TYPE: - pic_param->forward_reference_picture = ff_vaapi_get_surface(&s->last_picture); + pic_param->forward_reference_picture = ff_vaapi_get_surface_id(&s->last_picture); break; } diff --git a/libavcodec/vaapi_mpeg4.c b/libavcodec/vaapi_mpeg4.c index c4a973a4999..ab2bc355442 100644 --- a/libavcodec/vaapi_mpeg4.c +++ b/libavcodec/vaapi_mpeg4.c @@ -92,9 +92,9 @@ static int vaapi_mpeg4_start_frame(AVCodecContext *avctx, av_unused const uint8_ pic_param->TRD = s->pp_time; if (s->pict_type == FF_B_TYPE) - pic_param->backward_reference_picture = ff_vaapi_get_surface(&s->next_picture); + pic_param->backward_reference_picture = ff_vaapi_get_surface_id(&s->next_picture); if (s->pict_type != FF_I_TYPE) - pic_param->forward_reference_picture = ff_vaapi_get_surface(&s->last_picture); + pic_param->forward_reference_picture = ff_vaapi_get_surface_id(&s->last_picture); /* Fill in VAIQMatrixBufferMPEG4 */ /* Only the first inverse quantisation method uses the weighthing matrices */ diff --git a/libavcodec/vaapi_vc1.c b/libavcodec/vaapi_vc1.c index eae3c160fc1..137526972a1 100644 --- a/libavcodec/vaapi_vc1.c +++ b/libavcodec/vaapi_vc1.c @@ -242,10 +242,10 @@ static int vaapi_vc1_start_frame(AVCodecContext *avctx, av_unused const uint8_t switch (s->pict_type) { case FF_B_TYPE: - pic_param->backward_reference_picture = ff_vaapi_get_surface(&s->next_picture); + pic_param->backward_reference_picture = ff_vaapi_get_surface_id(&s->next_picture); // fall-through case FF_P_TYPE: - pic_param->forward_reference_picture = ff_vaapi_get_surface(&s->last_picture); + pic_param->forward_reference_picture = ff_vaapi_get_surface_id(&s->last_picture); break; } -- 2.39.2