[FFmpeg-cvslog] r20942 - in trunk/libavcodec: vaapi.c vaapi_internal.h vaapi_mpeg2.c vaapi_mpeg4.c vaapi_vc1.c

[gb]

Author: gb
Date: Mon Dec 28 10:03:09 2009
New Revision: 20942

Log:
Rename ff_vaapi_alloc_picture() to ff_vaapi_alloc_pic_param().

Modified:
   trunk/libavcodec/vaapi.c
   trunk/libavcodec/vaapi_internal.h
   trunk/libavcodec/vaapi_mpeg2.c
   trunk/libavcodec/vaapi_mpeg4.c
   trunk/libavcodec/vaapi_vc1.c

Modified: trunk/libavcodec/vaapi.c
==============================================================================
--- trunk/libavcodec/vaapi.c	Mon Dec 28 10:02:16 2009	(r20941)
+++ trunk/libavcodec/vaapi.c	Mon Dec 28 10:03:09 2009	(r20942)
@@ -129,7 +129,7 @@ static void *alloc_buffer(struct vaapi_c
     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);
 }

Modified: trunk/libavcodec/vaapi_internal.h
==============================================================================
--- trunk/libavcodec/vaapi_internal.h	Mon Dec 28 10:02:16 2009	(r20941)
+++ trunk/libavcodec/vaapi_internal.h	Mon Dec 28 10:03:09 2009	(r20942)
@@ -45,7 +45,7 @@ static inline VASurfaceID ff_vaapi_get_s
 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);

Modified: trunk/libavcodec/vaapi_mpeg2.c
==============================================================================
--- trunk/libavcodec/vaapi_mpeg2.c	Mon Dec 28 10:02:16 2009	(r20941)
+++ trunk/libavcodec/vaapi_mpeg2.c	Mon Dec 28 10:03:09 2009	(r20942)
@@ -49,7 +49,7 @@ static int vaapi_mpeg2_start_frame(AVCod
     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;

Modified: trunk/libavcodec/vaapi_mpeg4.c
==============================================================================
--- trunk/libavcodec/vaapi_mpeg4.c	Mon Dec 28 10:02:16 2009	(r20941)
+++ trunk/libavcodec/vaapi_mpeg4.c	Mon Dec 28 10:03:09 2009	(r20942)
@@ -51,7 +51,7 @@ static int vaapi_mpeg4_start_frame(AVCod
     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;

Modified: trunk/libavcodec/vaapi_vc1.c
==============================================================================
--- trunk/libavcodec/vaapi_vc1.c	Mon Dec 28 10:02:16 2009	(r20941)
+++ trunk/libavcodec/vaapi_vc1.c	Mon Dec 28 10:03:09 2009	(r20942)
@@ -142,7 +142,7 @@ static int vaapi_vc1_start_frame(AVCodec
     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;