[SCM] libav/experimental: Rename ff_vaapi_get_surface() to ff_vaapi_get_surface_id().

[siretart at users.alioth.debian.org]

The following commit has been merged in the experimental branch:
commit 36ad2b3ee014cac0f2d688dc9ef8cc92e07f73c8
Author: Gwenole Beauchesne <gbeauchesne at splitted-desktop.com>
Date:   Mon Dec 28 09:02:16 2009 +0000

    Rename ff_vaapi_get_surface() to ff_vaapi_get_surface_id().
    
    Originally committed as revision 20941 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavcodec/vaapi.c b/libavcodec/vaapi.c
index be73d0f..7912198 100644
--- a/libavcodec/vaapi.c
+++ b/libavcodec/vaapi.c
@@ -185,7 +185,7 @@ int ff_vaapi_common_end_frame(MpegEncContext *s)
     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 --git a/libavcodec/vaapi_internal.h b/libavcodec/vaapi_internal.h
index bfc0f80..2283980 100644
--- a/libavcodec/vaapi_internal.h
+++ b/libavcodec/vaapi_internal.h
@@ -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 --git a/libavcodec/vaapi_mpeg2.c b/libavcodec/vaapi_mpeg2.c
index fbc99ae..b6bd6fd 100644
--- a/libavcodec/vaapi_mpeg2.c
+++ b/libavcodec/vaapi_mpeg2.c
@@ -73,10 +73,10 @@ static int vaapi_mpeg2_start_frame(AVCodecContext *avctx, av_unused const uint8_
 
     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 --git a/libavcodec/vaapi_mpeg4.c b/libavcodec/vaapi_mpeg4.c
index c4a973a..ab2bc35 100644
--- a/libavcodec/vaapi_mpeg4.c
+++ b/libavcodec/vaapi_mpeg4.c
@@ -92,9 +92,9 @@ static int vaapi_mpeg4_start_frame(AVCodecContext *avctx, av_unused const uint8_
     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 --git a/libavcodec/vaapi_vc1.c b/libavcodec/vaapi_vc1.c
index eae3c16..1375269 100644
--- a/libavcodec/vaapi_vc1.c
+++ b/libavcodec/vaapi_vc1.c
@@ -242,10 +242,10 @@ static int vaapi_vc1_start_frame(AVCodecContext *avctx, av_unused const uint8_t
 
     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;
     }
 

-- 
Libav/FFmpeg packaging