# HG changeset patch
# User Gopu Govindaswamy
# Date 1395213956 -19800
# Wed Mar 19 12:55:56 2014 +0530
# Node ID 488a10d35896e9983d243fd347f9f5b5d83dd40b
# Parent f58d9c3840a3e9342656098fd7b510a59748fbae
TEncBinCoderCABAC: fix MingGW build "declaration of 'byte' shadows a global
declaration"
diff -r f58d9c3840a3 -r 488a10d35896
source/Lib/TLibEncoder/TEncBinCoderCABAC.cpp
--- a/source/Lib/TLibEncoder/TEncBinCoderCABAC.cpp Tue Mar 18 22:04:40
2014 -0500
+++ b/source/Lib/TLibEncoder/TEncBinCoderCABAC.cpp Wed Mar 19 12:55:56
2014 +0530
@@ -358,14 +358,14 @@
if (m_numBufferedBytes > 0)
{
uint32_t carry = leadByte >> 8;
- uint32_t byte = m_bufferedByte + carry;
+ uint32_t byteTowrite = m_bufferedByte + carry;
m_bufferedByte = leadByte & 0xff;
- m_bitIf->writeByte(byte);
+ m_bitIf->writeByte(byteTowrite);
- byte = (0xff + carry) & 0xff;
+ byteTowrite = (0xff + carry) & 0xff;
while (m_numBufferedBytes > 1)
{
- m_bitIf->writeByte(byte);
+ m_bitIf->writeByte(byteTowrite);
m_numBufferedBytes--;
}
}
_______________________________________________
x265-devel mailing list
[email protected]
https://mailman.videolan.org/listinfo/x265-devel
