Commit bd0eddb7 authored by Diego Biurrun's avatar Diego Biurrun

Revert converting two asserts into if checks and error messages.

It did not achieve the intended effect.

Originally committed as revision 17402 to svn://svn.ffmpeg.org/ffmpeg/trunk
parent ef7ae94b
......@@ -316,14 +316,11 @@ void ff_xvmc_decode_mb(MpegEncContext *s)
}
render->filled_mv_blocks_num++;
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");
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)
......
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