From cad1928f15982f7ace62d5a702fff2f369b99055 Mon Sep 17 00:00:00 2001 From: Diego Biurrun Date: Mon, 16 Feb 2009 00:21:16 +0000 Subject: Give struct members more sensible names: total_number_of_mv_blocks --> allocated_mv_blocks total_number_of_data_blocks --> allocated_data_blocks Originally committed as revision 17356 to svn://svn.ffmpeg.org/ffmpeg/trunk --- libavcodec/mpegvideo_xvmc.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'libavcodec/mpegvideo_xvmc.c') diff --git a/libavcodec/mpegvideo_xvmc.c b/libavcodec/mpegvideo_xvmc.c index 278ae37592..51dcb8cfa7 100644 --- a/libavcodec/mpegvideo_xvmc.c +++ b/libavcodec/mpegvideo_xvmc.c @@ -89,8 +89,8 @@ int ff_xvmc_field_start(MpegEncContext*s, AVCodecContext *avctx) render->filled_mv_blocks_num); return -1; } - if (render->total_number_of_mv_blocks < 1 || - render->total_number_of_data_blocks < mb_block_count) { + if (render->allocated_mv_blocks < 1 || + render->allocated_data_blocks < mb_block_count) { av_log(avctx, AV_LOG_ERROR, "Rendering surface doesn't provide enough block structures to work with.\n"); return -1; @@ -312,13 +312,13 @@ void ff_xvmc_decode_mb(MpegEncContext *s) } render->filled_mv_blocks_num++; - assert(render->filled_mv_blocks_num <= render->total_number_of_mv_blocks); - assert(render->next_free_data_block_num <= render->total_number_of_data_blocks); + assert(render->filled_mv_blocks_num <= render->allocated_mv_blocks); + assert(render->next_free_data_block_num <= render->allocated_data_blocks); /* The above conditions should not be able to fail as long as this function * is used and the following 'if ()' automatically calls a callback to free * blocks. */ - if (render->filled_mv_blocks_num == render->total_number_of_mv_blocks) + if (render->filled_mv_blocks_num == render->allocated_mv_blocks) ff_draw_horiz_band(s, 0, 0); } -- cgit v1.2.3