Revision 8b086712

View differences:

libavcodec/vaapi.c
129 129
    return data;
130 130
}
131 131

  
132
void *ff_vaapi_alloc_picture(struct vaapi_context *vactx, unsigned int size)
132
void *ff_vaapi_alloc_pic_param(struct vaapi_context *vactx, unsigned int size)
133 133
{
134 134
    return alloc_buffer(vactx, VAPictureParameterBufferType, size, &vactx->pic_param_buf_id);
135 135
}
libavcodec/vaapi_internal.h
45 45
int ff_vaapi_common_end_frame(MpegEncContext *s);
46 46

  
47 47
/** Allocate a new picture parameter buffer */
48
void *ff_vaapi_alloc_picture(struct vaapi_context *vactx, unsigned int size);
48
void *ff_vaapi_alloc_pic_param(struct vaapi_context *vactx, unsigned int size);
49 49

  
50 50
/** Allocate a new IQ matrix buffer */
51 51
void *ff_vaapi_alloc_iq_matrix(struct vaapi_context *vactx, unsigned int size);
libavcodec/vaapi_mpeg2.c
49 49
    vactx->slice_param_size = sizeof(VASliceParameterBufferMPEG2);
50 50

  
51 51
    /* Fill in VAPictureParameterBufferMPEG2 */
52
    pic_param = ff_vaapi_alloc_picture(vactx, sizeof(VAPictureParameterBufferMPEG2));
52
    pic_param = ff_vaapi_alloc_pic_param(vactx, sizeof(VAPictureParameterBufferMPEG2));
53 53
    if (!pic_param)
54 54
        return -1;
55 55
    pic_param->horizontal_size                                  = s->width;
libavcodec/vaapi_mpeg4.c
51 51
    vactx->slice_param_size = sizeof(VASliceParameterBufferMPEG4);
52 52

  
53 53
    /* Fill in VAPictureParameterBufferMPEG4 */
54
    pic_param = ff_vaapi_alloc_picture(vactx, sizeof(VAPictureParameterBufferMPEG4));
54
    pic_param = ff_vaapi_alloc_pic_param(vactx, sizeof(VAPictureParameterBufferMPEG4));
55 55
    if (!pic_param)
56 56
        return -1;
57 57
    pic_param->vop_width                                = s->width;
libavcodec/vaapi_vc1.c
142 142
    vactx->slice_param_size = sizeof(VASliceParameterBufferVC1);
143 143

  
144 144
    /* Fill in VAPictureParameterBufferVC1 */
145
    pic_param = ff_vaapi_alloc_picture(vactx, sizeof(VAPictureParameterBufferVC1));
145
    pic_param = ff_vaapi_alloc_pic_param(vactx, sizeof(VAPictureParameterBufferVC1));
146 146
    if (!pic_param)
147 147
        return -1;
148 148
    pic_param->forward_reference_picture                            = 0xffffffff;

Also available in: Unified diff