options_table: Add some missing #includes to fix "make checkheaders".

[ffmpeg] / libavcodec / vaapi.c

diff --git a/libavcodec/vaapi.c b/libavcodec/vaapi.c
index be73d0fea666c4189f208991c76869e43a34cfa8..d6b0298ee004ca4a95b738d1d9c4da741a4598ef 100644 (file)
--- a/libavcodec/vaapi.c
+++ b/libavcodec/vaapi.c
@@ -4,27 +4,27 @@
  *
  * 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
  */
 
 #include "vaapi_internal.h"
 
 /**
- * \addtogroup VAAPI_Decoding
+ * @addtogroup VAAPI_Decoding
  *
  * @{
  */
@@ -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);
 }
@@ -180,12 +180,12 @@ int ff_vaapi_common_end_frame(MpegEncContext *s)
     struct vaapi_context * const vactx = s->avctx->hwaccel_context;
     int ret = -1;
 
-    dprintf(s->avctx, "ff_vaapi_common_end_frame()\n");
+    av_dlog(s->avctx, "ff_vaapi_common_end_frame()\n");
 
     if (commit_slices(vactx) < 0)
         goto done;
     if (vactx->n_slice_buf_ids > 0) {
-        if (render_picture(vactx, ff_vaapi_get_surface(s->current_picture_ptr)) < 0)
+        if (render_picture(vactx, ff_vaapi_get_surface_id(s->current_picture_ptr)) < 0)
             goto done;
         ff_draw_horiz_band(s, 0, s->avctx->height);
     }