[SCM] libav/experimental: Revert converting two asserts into if checks and error messages. It did not achieve the intended effect.
siretart at users.alioth.debian.org
siretart at users.alioth.debian.org
Sun Jun 30 16:38:39 UTC 2013
The following commit has been merged in the experimental branch:
commit bd0eddb795b99a0a2050b7317aaeca7a0af1a4e8
Author: Diego Biurrun <diego at biurrun.de>
Date: Tue Feb 17 23:35:41 2009 +0000
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
diff --git a/libavcodec/mpegvideo_xvmc.c b/libavcodec/mpegvideo_xvmc.c
index ade7273..df95dff 100644
--- a/libavcodec/mpegvideo_xvmc.c
+++ b/libavcodec/mpegvideo_xvmc.c
@@ -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)
--
Libav/FFmpeg packaging
More information about the pkg-multimedia-commits
mailing list