comparison mpegvideo_xvmc.c @ 8944:1b00a4a76ade libavcodec

Replace two asserts by checks and error messages.
author diego
date Mon, 16 Feb 2009 02:02:49 +0000
parents 9dcb220e968c
children 8d3722a5973a
comparison
equal deleted inserted replaced
8943:c1fd3c6a8533 8944:1b00a4a76ade
310 render->next_free_data_block_num++; 310 render->next_free_data_block_num++;
311 } 311 }
312 } 312 }
313 render->filled_mv_blocks_num++; 313 render->filled_mv_blocks_num++;
314 314
315 assert(render->filled_mv_blocks_num <= render->allocated_mv_blocks); 315
316 assert(render->next_free_data_block_num <= render->allocated_data_blocks); 316 if (render->filled_mv_blocks_num > render->allocated_mv_blocks)
317 /* The above conditions should not be able to fail as long as this function 317 av_log(s->avctx, AV_LOG_ERROR,
318 * is used and the following 'if ()' automatically calls a callback to free 318 "Not enough space to store mv blocks allocated.\n");
319 * blocks. */ 319
320 if (render->next_free_data_block_num > render->allocated_data_blocks)
321 av_log(s->avctx, AV_LOG_ERROR,
322 "Offset to next data block exceeds number of allocated data blocks.\n");
320 323
321 324
322 if (render->filled_mv_blocks_num == render->allocated_mv_blocks) 325 if (render->filled_mv_blocks_num == render->allocated_mv_blocks)
323 ff_draw_horiz_band(s, 0, 0); 326 ff_draw_horiz_band(s, 0, 0);
324 } 327 }