Mercurial > libavcodec.hg

changeset 10723:3f08c340020f libavcodec

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Rename ff_vaapi_get_surface() to ff_vaapi_get_surface_id().
author gb
date Mon, 28 Dec 2009 09:02:16 +0000
parents de2a496db0e5
children de8d07d87c45
files vaapi.c vaapi_internal.h vaapi_mpeg2.c vaapi_mpeg4.c vaapi_vc1.c
diffstat 5 files changed, 8 insertions(+), 8 deletions(-) [+]
line wrap: on
line diff
--- a/vaapi.c	Sun Dec 27 14:32:23 2009 +0000
+++ b/vaapi.c	Mon Dec 28 09:02:16 2009 +0000
@@ -185,7 +185,7 @@
     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);
     }
--- a/vaapi_internal.h	Sun Dec 27 14:32:23 2009 +0000
+++ b/vaapi_internal.h	Mon Dec 28 09:02:16 2009 +0000
@@ -36,7 +36,7 @@
  */
 
 /** 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];
 }
--- a/vaapi_mpeg2.c	Sun Dec 27 14:32:23 2009 +0000
+++ b/vaapi_mpeg2.c	Mon Dec 28 09:02:16 2009 +0000
@@ -73,10 +73,10 @@
 
     switch (s->pict_type) {
     case FF_B_TYPE:
-        pic_param->backward_reference_picture = ff_vaapi_get_surface(&s->next_picture);
+        pic_param->backward_reference_picture = ff_vaapi_get_surface_id(&s->next_picture);
         // fall-through
     case FF_P_TYPE:
-        pic_param->forward_reference_picture = ff_vaapi_get_surface(&s->last_picture);
+        pic_param->forward_reference_picture = ff_vaapi_get_surface_id(&s->last_picture);
         break;
     }
 
--- a/vaapi_mpeg4.c	Sun Dec 27 14:32:23 2009 +0000
+++ b/vaapi_mpeg4.c	Mon Dec 28 09:02:16 2009 +0000
@@ -92,9 +92,9 @@
     pic_param->TRD                                      = s->pp_time;
 
     if (s->pict_type == FF_B_TYPE)
-        pic_param->backward_reference_picture = ff_vaapi_get_surface(&s->next_picture);
+        pic_param->backward_reference_picture = ff_vaapi_get_surface_id(&s->next_picture);
     if (s->pict_type != FF_I_TYPE)
-        pic_param->forward_reference_picture  = ff_vaapi_get_surface(&s->last_picture);
+        pic_param->forward_reference_picture  = ff_vaapi_get_surface_id(&s->last_picture);
 
     /* Fill in VAIQMatrixBufferMPEG4 */
     /* Only the first inverse quantisation method uses the weighthing matrices */
--- a/vaapi_vc1.c	Sun Dec 27 14:32:23 2009 +0000
+++ b/vaapi_vc1.c	Mon Dec 28 09:02:16 2009 +0000
@@ -242,10 +242,10 @@
 
     switch (s->pict_type) {
     case FF_B_TYPE:
-        pic_param->backward_reference_picture = ff_vaapi_get_surface(&s->next_picture);
+        pic_param->backward_reference_picture = ff_vaapi_get_surface_id(&s->next_picture);
         // fall-through
     case FF_P_TYPE:
-        pic_param->forward_reference_picture = ff_vaapi_get_surface(&s->last_picture);
+        pic_param->forward_reference_picture = ff_vaapi_get_surface_id(&s->last_picture);
         break;
     }