From 8b0867121e71afa9c5ab59d283c1075be8ac4182 Mon Sep 17 00:00:00 2001 From: Gwenole Beauchesne Date: Mon, 28 Dec 2009 09:03:09 +0000 Subject: [PATCH] Rename ff_vaapi_alloc_picture() to ff_vaapi_alloc_pic_param(). Originally committed as revision 20942 to svn://svn.ffmpeg.org/ffmpeg/trunk --- libavcodec/vaapi.c | 2 +- libavcodec/vaapi_internal.h | 2 +- libavcodec/vaapi_mpeg2.c | 2 +- libavcodec/vaapi_mpeg4.c | 2 +- libavcodec/vaapi_vc1.c | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/libavcodec/vaapi.c b/libavcodec/vaapi.c index 7912198e5d6..10f90542784 100644 --- a/libavcodec/vaapi.c +++ b/libavcodec/vaapi.c @@ -129,7 +129,7 @@ static void *alloc_buffer(struct vaapi_context *vactx, int type, unsigned int si return data; } -void *ff_vaapi_alloc_picture(struct vaapi_context *vactx, unsigned int size) +void *ff_vaapi_alloc_pic_param(struct vaapi_context *vactx, unsigned int size) { return alloc_buffer(vactx, VAPictureParameterBufferType, size, &vactx->pic_param_buf_id); } diff --git a/libavcodec/vaapi_internal.h b/libavcodec/vaapi_internal.h index 2283980a247..2c0fdf945ea 100644 --- a/libavcodec/vaapi_internal.h +++ b/libavcodec/vaapi_internal.h @@ -45,7 +45,7 @@ static inline VASurfaceID ff_vaapi_get_surface_id(Picture *pic) int ff_vaapi_common_end_frame(MpegEncContext *s); /** Allocate a new picture parameter buffer */ -void *ff_vaapi_alloc_picture(struct vaapi_context *vactx, unsigned int size); +void *ff_vaapi_alloc_pic_param(struct vaapi_context *vactx, unsigned int size); /** Allocate a new IQ matrix buffer */ void *ff_vaapi_alloc_iq_matrix(struct vaapi_context *vactx, unsigned int size); diff --git a/libavcodec/vaapi_mpeg2.c b/libavcodec/vaapi_mpeg2.c index b6bd6fdb134..1281f9ae0d5 100644 --- a/libavcodec/vaapi_mpeg2.c +++ b/libavcodec/vaapi_mpeg2.c @@ -49,7 +49,7 @@ static int vaapi_mpeg2_start_frame(AVCodecContext *avctx, av_unused const uint8_ vactx->slice_param_size = sizeof(VASliceParameterBufferMPEG2); /* Fill in VAPictureParameterBufferMPEG2 */ - pic_param = ff_vaapi_alloc_picture(vactx, sizeof(VAPictureParameterBufferMPEG2)); + pic_param = ff_vaapi_alloc_pic_param(vactx, sizeof(VAPictureParameterBufferMPEG2)); if (!pic_param) return -1; pic_param->horizontal_size = s->width; diff --git a/libavcodec/vaapi_mpeg4.c b/libavcodec/vaapi_mpeg4.c index ab2bc355442..15883a8464f 100644 --- a/libavcodec/vaapi_mpeg4.c +++ b/libavcodec/vaapi_mpeg4.c @@ -51,7 +51,7 @@ static int vaapi_mpeg4_start_frame(AVCodecContext *avctx, av_unused const uint8_ vactx->slice_param_size = sizeof(VASliceParameterBufferMPEG4); /* Fill in VAPictureParameterBufferMPEG4 */ - pic_param = ff_vaapi_alloc_picture(vactx, sizeof(VAPictureParameterBufferMPEG4)); + pic_param = ff_vaapi_alloc_pic_param(vactx, sizeof(VAPictureParameterBufferMPEG4)); if (!pic_param) return -1; pic_param->vop_width = s->width; diff --git a/libavcodec/vaapi_vc1.c b/libavcodec/vaapi_vc1.c index 137526972a1..b3777f5186b 100644 --- a/libavcodec/vaapi_vc1.c +++ b/libavcodec/vaapi_vc1.c @@ -142,7 +142,7 @@ static int vaapi_vc1_start_frame(AVCodecContext *avctx, av_unused const uint8_t vactx->slice_param_size = sizeof(VASliceParameterBufferVC1); /* Fill in VAPictureParameterBufferVC1 */ - pic_param = ff_vaapi_alloc_picture(vactx, sizeof(VAPictureParameterBufferVC1)); + pic_param = ff_vaapi_alloc_pic_param(vactx, sizeof(VAPictureParameterBufferVC1)); if (!pic_param) return -1; pic_param->forward_reference_picture = 0xffffffff; -- 2.39.2