highperfocused/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert converting two asserts into if checks and error messages.

Browse Source 
It did not achieve the intended effect.

Originally committed as revision 17402 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Diego Biurrun
2009-02-17 23:35:41 +00:00
parent ef7ae94ba2
commit bd0eddb795
1 changed files with 5 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
libavcodec/mpegvideo_xvmc.c
View File

@@ -316,14 +316,11 @@ void ff_xvmc_decode_mb(MpegEncContext *s)
} }
render->filled_mv_blocks_num++; render->filled_mv_blocks_num++;
assert(render->filled_mv_blocks_num <= render->allocated_mv_blocks);
if (render->filled_mv_blocks_num > render->allocated_mv_blocks) assert(render->next_free_data_block_num <= render->allocated_data_blocks);
av_log(s->avctx, AV_LOG_ERROR, /* The above conditions should not be able to fail as long as this function
"Not enough space to store mv blocks allocated.\n"); * is used and the following 'if ()' automatically calls a callback to free
* blocks. */
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");
if (render->filled_mv_blocks_num == render->allocated_mv_blocks) if (render->filled_mv_blocks_num == render->allocated_mv_blocks)