# HG changeset patch # User diego # Date 1234743676 0 # Node ID 42a048ecbba37297a88cc7b592dfae409f64ba91 # Parent d9555e218ce3407038d83f766fe764d5bd9c0f8a Give struct members more sensible names: total_number_of_mv_blocks --> allocated_mv_blocks total_number_of_data_blocks --> allocated_data_blocks diff -r d9555e218ce3 -r 42a048ecbba3 mpegvideo_xvmc.c --- a/mpegvideo_xvmc.c Mon Feb 16 00:09:00 2009 +0000 +++ b/mpegvideo_xvmc.c Mon Feb 16 00:21:16 2009 +0000 @@ -89,8 +89,8 @@ 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 @@ } 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); } diff -r d9555e218ce3 -r 42a048ecbba3 xvmc.h --- a/xvmc.h Mon Feb 16 00:09:00 2009 +0000 +++ b/xvmc.h Mon Feb 16 00:21:16 2009 +0000 @@ -66,13 +66,13 @@ - application - set during initialization - libavcodec - unchanged */ - int total_number_of_mv_blocks; + int allocated_mv_blocks; /** Number of blocks that can be stored at once in the data_blocks array. - application - set during initialization - libavcodec - unchanged */ - int total_number_of_data_blocks; + int allocated_data_blocks; /** Indicates that the hardware would interpret data_blocks as IDCT coefficients and perform IDCT on them.