Browse Source

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
tags/v0.5
Diego Biurrun 17 years ago
parent
commit
bd0eddb795
1 changed files with 5 additions and 8 deletions
  1. +5
    -8
      libavcodec/mpegvideo_xvmc.c

+ 5
- 8
libavcodec/mpegvideo_xvmc.c View File

@@ -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)


Loading…
Cancel
Save