diff options
| author | Diego Biurrun <diego@biurrun.de> | 2009-02-15 20:45:33 +0000 |
|---|---|---|
| committer | Diego Biurrun <diego@biurrun.de> | 2009-02-15 20:45:33 +0000 |
| commit | 4e30fa6e7b0829863ed4bacd6b89e4d8477a5452 (patch) | |
| tree | 07b26d90d63885bbb65ea135a8931fa22f90c261 | |
| parent | c1b0210115982f87cd9f55044586c3338a29b4d5 (diff) | |
| download | ffmpeg-4e30fa6e7b0829863ed4bacd6b89e4d8477a5452.tar.gz | |
Rename AV_XVMC_RENDER_MAGIC constant to AV_XVMC_ID to reflect a similar
change in the name of the struct member xvmc_id.
Originally committed as revision 17348 to svn://svn.ffmpeg.org/ffmpeg/trunk
| -rw-r--r-- | libavcodec/mpegvideo_xvmc.c | 10 | ||||
| -rw-r--r-- | libavcodec/xvmc.h | 2 |
2 files changed, 6 insertions, 6 deletions
diff --git a/libavcodec/mpegvideo_xvmc.c b/libavcodec/mpegvideo_xvmc.c index bd0de6935d..278ae37592 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->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, AVCodecContext *avctx) 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, AVCodecContext *avctx) 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, AVCodecContext *avctx) 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 diff --git a/libavcodec/xvmc.h b/libavcodec/xvmc.h index 33b4fe7c57..eaad3cc851 100644 --- a/libavcodec/xvmc.h +++ b/libavcodec/xvmc.h @@ -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 { |