[FFmpeg-cvslog] r17402 - trunk/libavcodec/mpegvideo_xvmc.c

diego subversion
Wed Feb 18 00:35:41 CET 2009


Author: diego
Date: Wed Feb 18 00:35:41 2009
New Revision: 17402

Log:
Revert converting two asserts into if checks and error messages.
It did not achieve the intended effect.

Modified:
   trunk/libavcodec/mpegvideo_xvmc.c

Modified: trunk/libavcodec/mpegvideo_xvmc.c
==============================================================================
--- trunk/libavcodec/mpegvideo_xvmc.c	Wed Feb 18 00:30:07 2009	(r17401)
+++ trunk/libavcodec/mpegvideo_xvmc.c	Wed Feb 18 00:35:41 2009	(r17402)
@@ -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)




More information about the ffmpeg-cvslog mailing list