# HG changeset patch
# User iive
# Date 1234723522 0
# Node ID b978ca882917f95050dee8bb0f478ce42aa41c46
# Parent  b8da7a21372c7655887a4846b7d2977cb5e04460
Rename unique_id to the way michaelni likes it. (xvmc_id)

diff -r b8da7a21372c -r b978ca882917 mpegvideo_xvmc.c
--- a/mpegvideo_xvmc.c	Sun Feb 15 18:30:39 2009 +0000
+++ b/mpegvideo_xvmc.c	Sun Feb 15 18:45:22 2009 +0000
@@ -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 @@
     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 @@
             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 @@
             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 @@
     // 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 -r b8da7a21372c -r b978ca882917 xvmc.h
--- a/xvmc.h	Sun Feb 15 18:30:39 2009 +0000
+++ b/xvmc.h	Sun Feb 15 18:45:22 2009 +0000
@@ -38,7 +38,7 @@
     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;