Commit ab5f86f8 authored by michael's avatar michael

10l


git-svn-id: file:///var/local/repositories/ffmpeg/trunk@3090 9553f0bf-9b14-0410-a0b8-cfaf0461ba5b
parent b12b7cd6
...@@ -597,7 +597,7 @@ int MPV_common_init(MpegEncContext *s) ...@@ -597,7 +597,7 @@ int MPV_common_init(MpegEncContext *s)
{ {
int y_size, c_size, yc_size, i, mb_array_size, mv_table_size, x, y; int y_size, c_size, yc_size, i, mb_array_size, mv_table_size, x, y;
if(s->avctx->thread_count > MAX_THREADS || 16*s->avctx->thread_count > s->height){ if(s->avctx->thread_count > MAX_THREADS || (16*s->avctx->thread_count > s->height && s->height)){
av_log(s->avctx, AV_LOG_ERROR, "too many threads\n"); av_log(s->avctx, AV_LOG_ERROR, "too many threads\n");
return -1; return -1;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment