# HG changeset patch
# User gb
# Date 1261990936 0
# Node ID 3f08c340020f5a0380adaac0f9f74212ad10300d
# Parent  de2a496db0e555c4897025461f9757e3419f8967
Rename ff_vaapi_get_surface() to ff_vaapi_get_surface_id().

diff -r de2a496db0e5 -r 3f08c340020f vaapi.c
--- 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);
     }
diff -r de2a496db0e5 -r 3f08c340020f vaapi_internal.h
--- 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];
 }
diff -r de2a496db0e5 -r 3f08c340020f vaapi_mpeg2.c
--- 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;
     }
 
diff -r de2a496db0e5 -r 3f08c340020f vaapi_mpeg4.c
--- 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 */
diff -r de2a496db0e5 -r 3f08c340020f vaapi_vc1.c
--- 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;
     }