[x265-commits] [x265] fix msvc build warnings

[Steve Borho]

details:   http://hg.videolan.org/x265/rev/73ece35100df
branches:  
changeset: 7141:73ece35100df
user:      Steve Borho <steve at borho.org>
date:      Fri Jun 20 00:17:02 2014 -0500
description:
fix msvc build warnings

diffstat:

 source/common/bitstream.cpp |  4 ++++
 source/encoder/cturow.cpp   |  2 +-
 2 files changed, 5 insertions(+), 1 deletions(-)

diffs (26 lines):

diff -r 5091ffc86a42 -r 73ece35100df source/common/bitstream.cpp
--- a/source/common/bitstream.cpp	Thu Jun 19 22:17:38 2014 -0500
+++ b/source/common/bitstream.cpp	Fri Jun 20 00:17:02 2014 -0500
@@ -3,6 +3,10 @@
 
 using namespace x265;
 
+#if defined(_MSC_VER)
+#pragma warning(disable: 4244)
+#endif
+
 #define MIN_FIFO_SIZE 1000
 
 Bitstream::Bitstream()
diff -r 5091ffc86a42 -r 73ece35100df source/encoder/cturow.cpp
--- a/source/encoder/cturow.cpp	Thu Jun 19 22:17:38 2014 -0500
+++ b/source/encoder/cturow.cpp	Fri Jun 20 00:17:02 2014 -0500
@@ -85,7 +85,7 @@ void CTURow::processCU(TComDataCU *cu, T
     // restore entropy coder to an initial state
     m_entropyCoder.setEntropyCoder(m_rdSbacCoders[0][CI_CURR_BEST], slice);
     m_entropyCoder.setBitstream(&bc);
-    m_cuCoder.setBitCounting(&bc);
+    m_cuCoder.setBitCounting(true);
     bc.resetBits();
 
     m_cuCoder.encodeCU(cu);  // Count bits