[x265-commits] [x265] analysis: initialize member pointers to NULL

[Steve Borho]

details:   http://hg.videolan.org/x265/rev/214770dde42d
branches:  
changeset: 9685:214770dde42d
user:      Steve Borho <steve at borho.org>
date:      Wed Mar 11 19:20:52 2015 -0500
description:
analysis: initialize member pointers to NULL
Subject: [x265] search: no longer needs a pool pointer

details:   http://hg.videolan.org/x265/rev/05a416d13228
branches:  
changeset: 9686:05a416d13228
user:      Steve Borho <steve at borho.org>
date:      Wed Mar 11 19:50:56 2015 -0500
description:
search: no longer needs a pool pointer

diffstat:

 source/encoder/analysis.cpp     |  2 ++
 source/encoder/frameencoder.cpp |  2 --
 source/encoder/search.h         |  1 -
 3 files changed, 2 insertions(+), 3 deletions(-)

diffs (42 lines):

diff -r 78a1e8dfc2d5 -r 05a416d13228 source/encoder/analysis.cpp
--- a/source/encoder/analysis.cpp	Wed Mar 11 14:44:38 2015 -0500
+++ b/source/encoder/analysis.cpp	Wed Mar 11 19:50:56 2015 -0500
@@ -73,6 +73,8 @@ Analysis::Analysis()
 {
     m_reuseIntraDataCTU = NULL;
     m_reuseInterDataCTU = NULL;
+    m_reuseRef = NULL;
+    m_reuseBestMergeCand = NULL;
 }
 
 bool Analysis::create(ThreadLocalData *tld)
diff -r 78a1e8dfc2d5 -r 05a416d13228 source/encoder/frameencoder.cpp
--- a/source/encoder/frameencoder.cpp	Wed Mar 11 14:44:38 2015 -0500
+++ b/source/encoder/frameencoder.cpp	Wed Mar 11 19:50:56 2015 -0500
@@ -245,7 +245,6 @@ void FrameEncoder::threadMain()
             m_tld = new ThreadLocalData[numTLD];
             for (int i = 0; i < numTLD; i++)
             {
-                m_tld[i].analysis.m_pool = m_pool;
                 m_tld[i].analysis.initSearch(*m_param, m_top->m_scalingList);
                 m_tld[i].analysis.create(m_tld);
             }
@@ -268,7 +267,6 @@ void FrameEncoder::threadMain()
     else
     {
         m_tld = new ThreadLocalData;
-        m_tld->analysis.m_pool = NULL;
         m_tld->analysis.initSearch(*m_param, m_top->m_scalingList);
         m_tld->analysis.create(NULL);
         m_localTldIdx = 0;
diff -r 78a1e8dfc2d5 -r 05a416d13228 source/encoder/search.h
--- a/source/encoder/search.h	Wed Mar 11 14:44:38 2015 -0500
+++ b/source/encoder/search.h	Wed Mar 11 19:50:56 2015 -0500
@@ -224,7 +224,6 @@ public:
     Quant           m_quant;
     RDCost          m_rdCost;
     const x265_param* m_param;
-    ThreadPool*     m_pool;
     Frame*          m_frame;
     const Slice*    m_slice;