# HG changeset patch # User gb # Date 1261990989 0 # Node ID de8d07d87c45457ae0b6a70919c73c175997a48a # Parent 3f08c340020f5a0380adaac0f9f74212ad10300d Rename ff_vaapi_alloc_picture() to ff_vaapi_alloc_pic_param(). diff -r 3f08c340020f -r de8d07d87c45 vaapi.c --- a/vaapi.c Mon Dec 28 09:02:16 2009 +0000 +++ b/vaapi.c Mon Dec 28 09:03:09 2009 +0000 @@ -129,7 +129,7 @@ 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 -r 3f08c340020f -r de8d07d87c45 vaapi_internal.h --- a/vaapi_internal.h Mon Dec 28 09:02:16 2009 +0000 +++ b/vaapi_internal.h Mon Dec 28 09:03:09 2009 +0000 @@ -45,7 +45,7 @@ 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 -r 3f08c340020f -r de8d07d87c45 vaapi_mpeg2.c --- a/vaapi_mpeg2.c Mon Dec 28 09:02:16 2009 +0000 +++ b/vaapi_mpeg2.c Mon Dec 28 09:03:09 2009 +0000 @@ -49,7 +49,7 @@ 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 -r 3f08c340020f -r de8d07d87c45 vaapi_mpeg4.c --- a/vaapi_mpeg4.c Mon Dec 28 09:02:16 2009 +0000 +++ b/vaapi_mpeg4.c Mon Dec 28 09:03:09 2009 +0000 @@ -51,7 +51,7 @@ 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 -r 3f08c340020f -r de8d07d87c45 vaapi_vc1.c --- a/vaapi_vc1.c Mon Dec 28 09:02:16 2009 +0000 +++ b/vaapi_vc1.c Mon Dec 28 09:03:09 2009 +0000 @@ -142,7 +142,7 @@ 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;