[x265] [PATCH] fix crash on no-wpp mode (Issue #217)

Min Chen chenm003 at 163.com
Wed Jan 6 18:00:42 CET 2016


# HG changeset patch
# User Min Chen <chenm003 at 163.com>
# Date 1452096133 21600
# Node ID 2417df96af4efcaa8c16e7138028d8b2bbb034ab
# Parent  25f78ff3d8efaa1e9d85bc3e718c887ec9afa557
fix crash on no-wpp mode (Issue #217)
---
 source/encoder/frameencoder.cpp |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff -r 25f78ff3d8ef -r 2417df96af4e source/encoder/frameencoder.cpp
--- a/source/encoder/frameencoder.cpp	Tue Dec 22 18:13:28 2015 +0530
+++ b/source/encoder/frameencoder.cpp	Wed Jan 06 10:02:13 2016 -0600
@@ -1102,7 +1102,7 @@
         {
             // TODO: Multiple Threading
             // Delay ONE row to avoid Intra Prediction Conflict
-            if (row >= 1)
+            if (m_pool && (row >= 1))
             {
                 // Waitting last threading finish
                 m_frameFilter.m_parallelFilter[row - 1].waitForExit();
@@ -1121,7 +1121,7 @@
             }
 
             // Last Row may start early
-            if (row == m_numRows - 1)
+            if (m_pool && (row == m_numRows - 1))
             {
                 // Waiting for the last thread to finish
                 m_frameFilter.m_parallelFilter[row].waitForExit();



More information about the x265-devel mailing list