[x265] [PATCH] stats: fix skip cu count for 2 pass

[Divya Manivannan]

# HG changeset patch
# User Divya Manivannan <divya at multicorewareinc.com>
# Date 1436957333 -19800
#      Wed Jul 15 16:18:53 2015 +0530
# Node ID 17d813ba798e7e68ed0c21432577dc70afc4323b
# Parent  8023786c52475484a5dd475254cac67ce65e81df
stats: fix skip cu count for 2 pass

diff -r 8023786c5247 -r 17d813ba798e source/encoder/frameencoder.cpp
--- a/source/encoder/frameencoder.cpp	Mon Jul 13 17:38:02 2015 -0700
+++ b/source/encoder/frameencoder.cpp	Wed Jul 15 16:18:53 2015 +0530
@@ -958,7 +958,7 @@
                     curRow.rowStats.intra8x8Cnt += (int)(frameLog.cntIntra[depth] << shift);
 
                 curRow.rowStats.inter8x8Cnt += (int)(frameLog.cntInter[depth] << shift);
-                curRow.rowStats.skip8x8Cnt  += (int)(frameLog.cntSkipCu[depth] << shift);
+                curRow.rowStats.skip8x8Cnt += (int)((frameLog.cntSkipCu[depth] + frameLog.cntMergeCu[depth]) << shift);
             }
         }
         curRow.rowStats.cntIntraNxN += frameLog.cntIntraNxN;