Commit f9d5bf3c authored by Diego Biurrun's avatar Diego Biurrun
Browse files

Replace two asserts by checks and error messages.

Originally committed as revision 17362 to svn://svn.ffmpeg.org/ffmpeg/trunk
parent e7c88eb7
......@@ -312,11 +312,14 @@ void ff_xvmc_decode_mb(MpegEncContext *s)
}
render->filled_mv_blocks_num++;
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->allocated_mv_blocks)
av_log(s->avctx, AV_LOG_ERROR,
"Not enough space to store mv blocks allocated.\n");
if (render->next_free_data_block_num > render->allocated_data_blocks)
av_log(s->avctx, AV_LOG_ERROR,
"Offset to next data block exceeds number of allocated data blocks.\n");
if (render->filled_mv_blocks_num == render->allocated_mv_blocks)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment