From: Anton Mitrofanov <BugMaster@narod.ru>
Date: Wed, 21 Dec 2011 07:08:56 +0000 (+0400)
Subject: Fix crash with sliced threads and input height <= 112
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=2df9d45db64110854e6da6a2037d6c432c5463fe;p=libx264

Fix crash with sliced threads and input height <= 112
---

diff --git a/encoder/encoder.c b/encoder/encoder.c
index 65ab5c38..adac4f82 100644
--- a/encoder/encoder.c
+++ b/encoder/encoder.c
@@ -472,7 +472,6 @@ static int x264_validate_parameters( x264_t *h, int b_open )
 
     if( h->param.i_threads == X264_THREADS_AUTO )
         h->param.i_threads = x264_cpu_num_processors() * (h->param.b_sliced_threads?2:3)/2;
-    h->param.i_threads = x264_clip3( h->param.i_threads, 1, X264_THREAD_MAX );
     if( h->param.i_threads > 1 )
     {
 #if !HAVE_THREAD
@@ -487,7 +486,8 @@ static int x264_validate_parameters( x264_t *h, int b_open )
             h->param.i_threads = X264_MIN( h->param.i_threads, max_threads );
         }
     }
-    else
+    h->param.i_threads = x264_clip3( h->param.i_threads, 1, X264_THREAD_MAX );
+    if( h->param.i_threads == 1 )
         h->param.b_sliced_threads = 0;
     h->i_thread_frames = h->param.b_sliced_threads ? 1 : h->param.i_threads;
     if( h->i_thread_frames > 1 )