Rename ff_vaapi_alloc_picture() to ff_vaapi_alloc_pic_param().

Originally committed as revision 20942 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavcodec/vaapi.c b/libavcodec/vaapi.c
index 7912198e5d62ddeaceac11e1ba6b8a6e1e330847..10f9054278490bcfe93a7fa86204be2e8ed43ca9 100644 (file)
--- 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 2283980a247d64224a536977d5d911af5d7aed03..2c0fdf945eaf8741914e990493cf2a860075040a 100644 (file)
--- 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 b6bd6fdb134a9d485110b2c68e2a34e4c5b2659e..1281f9ae0d5559bbd1524643c80e8444c3a489e2 100644 (file)
--- 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 ab2bc3554421c9547072a28eb486bbe4c641c7e4..15883a8464ff3bb1f2d1eb9593bb2c4b652ac34c 100644 (file)
--- 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 137526972a1ea6e1546722cde53ef024583d0b75..b3777f5186bfa92adfea175c4c40a570df60858a 100644 (file)
--- 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;