[FFmpeg-cvslog] r17348 - in trunk/libavcodec: mpegvideo_xvmc.c xvmc.h

[diego]

Author: diego
Date: Sun Feb 15 21:45:33 2009
New Revision: 17348

Log:
Rename AV_XVMC_RENDER_MAGIC constant to AV_XVMC_ID to reflect a similar
change in the name of the struct member xvmc_id.

Modified:
   trunk/libavcodec/mpegvideo_xvmc.c
   trunk/libavcodec/xvmc.h

Modified: trunk/libavcodec/mpegvideo_xvmc.c
==============================================================================
--- trunk/libavcodec/mpegvideo_xvmc.c	Sun Feb 15 21:45:10 2009	(r17347)
+++ trunk/libavcodec/mpegvideo_xvmc.c	Sun Feb 15 21:45:33 2009	(r17348)
@@ -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->xvmc_id == AV_XVMC_RENDER_MAGIC);
+    assert(render && render->xvmc_id == AV_XVMC_ID);
 
     s->block = (DCTELEM *)(render->data_blocks + render->next_free_data_block_num * 64);
 }
@@ -76,7 +76,7 @@ int ff_xvmc_field_start(MpegEncContext*s
     const int mb_block_count = 4 + (1 << s->chroma_format);
 
     assert(avctx);
-    if (!render || render->xvmc_id != AV_XVMC_RENDER_MAGIC ||
+    if (!render || render->xvmc_id != AV_XVMC_ID ||
         !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
             next = (struct xvmc_pix_fmt*)s->next_picture.data[2];
             if (!next)
                 return -1;
-            if (next->xvmc_id != AV_XVMC_RENDER_MAGIC)
+            if (next->xvmc_id != AV_XVMC_ID)
                 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
             last = (struct xvmc_pix_fmt*)s->last_picture.data[2];
             if (!last)
                 last = render; // predict second field from the first
-            if (last->xvmc_id != AV_XVMC_RENDER_MAGIC)
+            if (last->xvmc_id != AV_XVMC_ID)
                 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->xvmc_id == AV_XVMC_RENDER_MAGIC);
+    assert(render->xvmc_id == AV_XVMC_ID);
     assert(render->mv_blocks);
 
     // take the next free macroblock

Modified: trunk/libavcodec/xvmc.h
==============================================================================
--- trunk/libavcodec/xvmc.h	Sun Feb 15 21:45:10 2009	(r17347)
+++ trunk/libavcodec/xvmc.h	Sun Feb 15 21:45:33 2009	(r17348)
@@ -30,7 +30,7 @@
 #define AV_XVMC_STATE_PREDICTION               2  /**  the surface is needed for prediction, the codec manipulates this */
 #define AV_XVMC_STATE_OSD_SOURCE               4  /**  the surface is needed for subpicture rendering */
 #endif
-#define AV_XVMC_RENDER_MAGIC          0x1DC711C0  /**< magic value to ensure that regular pixel routines haven't corrupted the struct
+#define AV_XVMC_ID                    0x1DC711C0  /**< special value to ensure that regular pixel routines haven't corrupted the struct
                                                        the number is 1337 speak for the letters IDCT MCo (motion compensation) */
 
 struct xvmc_pix_fmt {