# HG changeset patch
# User Mahesh Pittala <[email protected]>
# Date 1450792558 -19800
# Tue Dec 22 19:25:58 2015 +0530
# Node ID fac54855737cd8fbd1876dc43a62b78ceb61fb96
# Parent 6a0bb9c80bd3f5e8d66ac04c0f44c88ec83345d1
400 subsampling: fix warnings for Mac OSX
diff -r 6a0bb9c80bd3 -r fac54855737c source/common/cudata.h
--- a/source/common/cudata.h Tue Dec 22 18:13:28 2015 +0530
+++ b/source/common/cudata.h Tue Dec 22 19:25:58 2015 +0530
@@ -246,7 +246,7 @@
void setPURefIdx(int list, int8_t refIdx, int absPartIdx, int puIdx);
uint8_t getCbf(uint32_t absPartIdx, TextType ttype, uint32_t tuDepth)
const { return (m_cbf[ttype][absPartIdx] >> tuDepth) & 0x1; }
- uint8_t getQtRootCbf(uint32_t absPartIdx) const
{ if (m_chromaFormat == X265_CSP_I400) return m_cbf[0][absPartIdx] || 0; else
{ return m_cbf[0][absPartIdx] || m_cbf[1][absPartIdx] || m_cbf[2][absPartIdx];}
}
+ uint8_t getQtRootCbf(uint32_t absPartIdx) const
{ if (m_chromaFormat == X265_CSP_I400) return m_cbf[0][absPartIdx] || false;
else { return m_cbf[0][absPartIdx] || m_cbf[1][absPartIdx] ||
m_cbf[2][absPartIdx];} }
int8_t getRefQP(uint32_t currAbsIdxInCTU) const;
uint32_t getInterMergeCandidates(uint32_t absPartIdx, uint32_t puIdx,
MVField (*candMvField)[2], uint8_t* candDir) const;
void clipMv(MV& outMV) const;
_______________________________________________
x265-devel mailing list
[email protected]
https://mailman.videolan.org/listinfo/x265-devel
