diff options
| author | Ivan Kalvachev <ikalvachev@gmail.com> | 2009-02-15 18:45:22 +0000 |
|---|---|---|
| committer | Ivan Kalvachev <ikalvachev@gmail.com> | 2009-02-15 18:45:22 +0000 |
| commit | 1fcef40847b9beab5b1979c10efd78aa1094dbe7 (patch) | |
| tree | 435f4ae2bd2ed01b2aaa826713a7727b582c65c1 /libavcodec/mpegvideo_xvmc.c | |
| parent | 3d43e42f293bd79a4b4cd93b499f438827481eb8 (diff) | |
Rename unique_id to the way michaelni likes it. (xvmc_id)
Originally committed as revision 17341 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec/mpegvideo_xvmc.c')
| -rw-r--r-- | libavcodec/mpegvideo_xvmc.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/libavcodec/mpegvideo_xvmc.c b/libavcodec/mpegvideo_xvmc.c index d9b238ac0f..e65431114d 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 |