diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2004-04-30 01:35:45 +0000 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2004-04-30 01:35:45 +0000 |
| commit | 844ce49d127c45b848557b57734d18b4c8878f3e (patch) | |
| tree | aee1838ee9e6b43acad64f78c56b3f28a05229fd | |
| parent | d1700ead3b5aede98980d302959dbab4c1c000f3 (diff) | |
| download | ffmpeg-844ce49d127c45b848557b57734d18b4c8878f3e.tar.gz | |
10l
Originally committed as revision 3090 to svn://svn.ffmpeg.org/ffmpeg/trunk
| -rw-r--r-- | libavcodec/mpegvideo.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/mpegvideo.c b/libavcodec/mpegvideo.c index 7b97e15f33..772775cdad 100644 --- a/libavcodec/mpegvideo.c +++ b/libavcodec/mpegvideo.c @@ -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; - 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"); return -1; } |