Commit 4e82a3c8 authored by diego's avatar diego

Revert converting two asserts into if checks and error messages.

It did not achieve the intended effect.


git-svn-id: file:///var/local/repositories/ffmpeg/trunk@17402 9553f0bf-9b14-0410-a0b8-cfaf0461ba5b
parent 104828f6
...@@ -316,14 +316,11 @@ void ff_xvmc_decode_mb(MpegEncContext *s) ...@@ -316,14 +316,11 @@ void ff_xvmc_decode_mb(MpegEncContext *s)
} }
render->filled_mv_blocks_num++; render->filled_mv_blocks_num++;
assert(render->filled_mv_blocks_num <= render->allocated_mv_blocks);
if (render->filled_mv_blocks_num > render->allocated_mv_blocks) assert(render->next_free_data_block_num <= render->allocated_data_blocks);
av_log(s->avctx, AV_LOG_ERROR, /* The above conditions should not be able to fail as long as this function
"Not enough space to store mv blocks allocated.\n"); * is used and the following 'if ()' automatically calls a callback to free
* blocks. */
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) 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