Commit 3d5b8e87 authored by michael's avatar michael

10l


git-svn-id: file:///var/local/repositories/ffmpeg/trunk@3088 9553f0bf-9b14-0410-a0b8-cfaf0461ba5b
parent 290438d7
......@@ -597,6 +597,11 @@ 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){
av_log(s->avctx, AV_LOG_ERROR, "too many threads\n");
return -1;
}
dsputil_init(&s->dsp, s->avctx);
DCT_common_init(s);
......@@ -990,11 +995,6 @@ int MPV_encode_init(AVCodecContext *avctx)
return -1;
}
if(s->avctx->thread_count > MAX_THREADS || 16*s->avctx->thread_count > s->height){
av_log(avctx, AV_LOG_ERROR, "too many threads\n");
return -1;
}
if(s->avctx->thread_count > 1)
s->rtp_mode= 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