]> git.sesse.net Git - ffmpeg/commitdiff
Revert 17308.
authorIvan Kalvachev <ikalvachev@gmail.com>
Sun, 15 Feb 2009 07:55:39 +0000 (07:55 +0000)
committerIvan Kalvachev <ikalvachev@gmail.com>
Sun, 15 Feb 2009 07:55:39 +0000 (07:55 +0000)
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

index 7fd42440355808b15aaaf6058fbdffc58c187814..3c24ae72821941b355a59578d73c817ccd3c52cd 100644 (file)
@@ -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");
 }