[SCM] libav/experimental: Rename unique_id to the way michaelni likes it. (xvmc_id)

[siretart at users.alioth.debian.org]

The following commit has been merged in the experimental branch:
commit 1fcef40847b9beab5b1979c10efd78aa1094dbe7
Author: Ivan Kalvachev <ikalvachev at gmail.com>
Date:   Sun Feb 15 18:45:22 2009 +0000

    Rename unique_id to the way michaelni likes it. (xvmc_id)
    
    Originally committed as revision 17341 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavcodec/mpegvideo_xvmc.c b/libavcodec/mpegvideo_xvmc.c
index d9b238a..e654311 100644
--- a/libavcodec/mpegvideo_xvmc.c
+++ b/libavcodec/mpegvideo_xvmc.c
@@ -41,7 +41,7 @@
 void ff_xvmc_init_block(MpegEncContext *s)
 {
     struct xvmc_pix_fmt *render = (struct xvmc_pix_fmt*)s->current_picture.data[2];
-    assert(render && render->unique_id == AV_XVMC_RENDER_MAGIC);
+    assert(render && render->xvmc_id == AV_XVMC_RENDER_MAGIC);
 
     s->block = (DCTELEM *)(render->data_blocks + render->next_free_data_block_num * 64);
 }
@@ -76,7 +76,7 @@ int ff_xvmc_field_start(MpegEncContext*s, AVCodecContext *avctx)
     const int mb_block_count = 4 + (1 << s->chroma_format);
 
     assert(avctx);
-    if (!render || render->unique_id != AV_XVMC_RENDER_MAGIC ||
+    if (!render || render->xvmc_id != AV_XVMC_RENDER_MAGIC ||
         !render->data_blocks || !render->mv_blocks) {
         av_log(avctx, AV_LOG_ERROR,
                "Render token doesn't look as expected.\n");
@@ -108,7 +108,7 @@ int ff_xvmc_field_start(MpegEncContext*s, AVCodecContext *avctx)
             next = (struct xvmc_pix_fmt*)s->next_picture.data[2];
             if (!next)
                 return -1;
-            if (next->unique_id != AV_XVMC_RENDER_MAGIC)
+            if (next->xvmc_id != AV_XVMC_RENDER_MAGIC)
                 return -1;
             render->p_future_surface = next->p_surface;
             // no return here, going to set forward prediction
@@ -116,7 +116,7 @@ int ff_xvmc_field_start(MpegEncContext*s, AVCodecContext *avctx)
             last = (struct xvmc_pix_fmt*)s->last_picture.data[2];
             if (!last)
                 last = render; // predict second field from the first
-            if (last->unique_id != AV_XVMC_RENDER_MAGIC)
+            if (last->xvmc_id != AV_XVMC_RENDER_MAGIC)
                 return -1;
             render->p_past_surface = last->p_surface;
             return 0;
@@ -176,7 +176,7 @@ void ff_xvmc_decode_mb(MpegEncContext *s)
     // start of XVMC-specific code
     render = (struct xvmc_pix_fmt*)s->current_picture.data[2];
     assert(render);
-    assert(render->unique_id == AV_XVMC_RENDER_MAGIC);
+    assert(render->xvmc_id == AV_XVMC_RENDER_MAGIC);
     assert(render->mv_blocks);
 
     // take the next free macroblock
diff --git a/libavcodec/xvmc.h b/libavcodec/xvmc.h
index 95343e9..5c87957 100644
--- a/libavcodec/xvmc.h
+++ b/libavcodec/xvmc.h
@@ -38,7 +38,7 @@ struct xvmc_pix_fmt {
     Once set these values are not supposed to be modified.
 */
 //@{
-    int             unique_id;                     ///< used as a check against memory corruption by regular pixel routines or other API structure
+    int             xvmc_id;                      ///< used as a check against memory corruption by regular pixel routines or other API structure
 
     short*          data_blocks;
     XvMCMacroBlock* mv_blocks;

-- 
Libav/FFmpeg packaging