From 1a90cf3c9884c9a2d6ee4bcee0f27332a861367e Mon Sep 17 00:00:00 2001 From: Ivan Kalvachev Date: Sun, 15 Feb 2009 07:55:39 +0000 Subject: Revert 17308. The above commit makes ff_xvmc_decode_mb to output one log entry for each decoded MB, causing massive slowdown. Originally committed as revision 17312 to svn://svn.ffmpeg.org/ffmpeg/trunk --- libavcodec/mpegvideo_xvmc.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/libavcodec/mpegvideo_xvmc.c b/libavcodec/mpegvideo_xvmc.c index 7fd4244035..3c24ae7282 100644 --- a/libavcodec/mpegvideo_xvmc.c +++ b/libavcodec/mpegvideo_xvmc.c @@ -290,14 +290,13 @@ void ff_xvmc_decode_mb(MpegEncContext *s) } 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); - /* The above condition should not be able to fail as long as this function + /* 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) ff_draw_horiz_band(s, 0, 0); - else - av_log(s->avctx, AV_LOG_ERROR, "Not all blocks have been processed.\n"); } -- cgit v1.2.3