Merge branch 'master' into devel

This commit is contained in:
jfmcarreira committed 2018-10-18 02:56:51 +01:00
commit cac909c35e
20 files changed
+383 -1044

No files matched your search

+1 -1
View File
@@ -35,10 +35,10 @@ class HEVCIntraPrediction : public CalypModuleIf
private:
CalypFrame* m_pcPredBlock;
unsigned int m_uiMode;
unsigned int m_uiBlockSize;
unsigned int m_uiXpel;
unsigned int m_uiYpel;
bool m_bShowResidue;
int m_iBlockSize;
ClpPel* m_referenceMem;
public: