jfmcarreira/calyp
1
0 Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge with stable after wrong versioning

Browse Source
This commit is contained in:
jfmcarreira committed 2017-09-28 03:27:33 +01:00
1 parent a4cf934c76
commit b0d5c32099
2 files changed
+4 -4
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

CMakeLists.txt
+2 -2
View File
@@ -20,8 +20,8 @@ set( PROJECT_NAME "playuver" CACHE INTERNAL "" FORCE )
PROJECT( ${PROJECT_NAME} )
SET( PLAYUVER_VERSION_MAJOR "0" )
SET( PLAYUVER_VERSION_MINOR "14" )
SET( PLAYUVER_VERSION_PATCH "2" )
SET( PLAYUVER_VERSION_MINOR "15" )
SET( PLAYUVER_VERSION_PATCH "0" )
SET( PLAYUVER_VERSION "${PLAYUVER_VERSION_MAJOR}.${PLAYUVER_VERSION_MINOR}.${PLAYUVER_VERSION_PATCH}" CACHE INTERNAL "" FORCE )
######################################################################################
modules/InterFrameVariance.cpp
+2 -2
View File
@@ -67,7 +67,7 @@ PlaYUVerFrame* InterFrameVariance::process( std::vector<PlaYUVerFrame*> apcFrame
{
Int numFrames = apcFrameList.size();
Pel** pInput = new Pel*[numFrames];
Pel** pInput = new Pel*[numFrames];
Pel* pOutputPelYUV = m_pcFrameVariance->getPelBufferYUV()[0][0];
for( Int i = 0; i < numFrames; i++ )
@@ -101,7 +101,7 @@ PlaYUVerFrame* InterFrameVariance::process( std::vector<PlaYUVerFrame*> apcFrame
{
*pOutputPelYUV++ = m_pVariance[y][x] * 255 / maxVariance;
}
delete [] pInput;
delete[] pInput;
return m_pcFrameVariance;
}