X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=libavcodec%2Fvaapi_internal.h;h=c6d5d6e42a79cb560fc9fd03538db438a1229810;hb=02e7dbf5adc6aa702472010c33aec9bfd904702f;hp=bfc0f80162b2b39911d52533d176f2ebb643b1b6;hpb=a3d636aff9d18e66fa3e260f515f6e9dba25bf2f;p=ffmpeg

diff --git a/libavcodec/vaapi_internal.h b/libavcodec/vaapi_internal.h
index bfc0f80162b..c6d5d6e42a7 100644
--- a/libavcodec/vaapi_internal.h
+++ b/libavcodec/vaapi_internal.h
@@ -4,20 +4,20 @@
  *
  * Copyright (C) 2008-2009 Splitted-Desktop Systems
  *
- * This file is part of FFmpeg.
+ * This file is part of Libav.
  *
- * FFmpeg is free software; you can redistribute it and/or
+ * Libav is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
  * License as published by the Free Software Foundation; either
  * version 2.1 of the License, or (at your option) any later version.
  *
- * FFmpeg is distributed in the hope that it will be useful,
+ * Libav is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with FFmpeg; if not, write to the Free Software
+ * License along with Libav; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
@@ -30,22 +30,22 @@
 #include "mpegvideo.h"
 
 /**
- * \addtogroup VAAPI_Decoding
+ * @addtogroup VAAPI_Decoding
  *
  * @{
  */
 
 /** Extract VASurfaceID from a Picture */
-static inline VASurfaceID ff_vaapi_get_surface(Picture *pic)
+static inline VASurfaceID ff_vaapi_get_surface_id(Picture *pic)
 {
-    return (uintptr_t)pic->data[3];
+    return (uintptr_t)pic->f.data[3];
 }
 
 /** Common AVHWAccel.end_frame() implementation */
 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);