Merge branch 'master' into devel

This commit is contained in:
jfmcarreira committed 2015-04-27 17:15:29 +01:00
commit f07ab78939
3 files changed
+8 -6

No files matched your search

+2
View File
@@ -138,9 +138,11 @@ PlaYUVerFrame::~PlaYUVerFrame()
{
if( m_pppcInputPel )
freeMem3ImageComponents<Pel>( m_pppcInputPel );
m_pppcInputPel = NULL;
if( m_pcARGB32 )
freeMem1D( m_pcARGB32 );
m_pcARGB32 = NULL;
closePixfc();
}
+1 -1
View File
@@ -45,7 +45,7 @@ PlaYUVerFrameStats::~PlaYUVerFrameStats()
{
if( m_puiHistogram )
freeMem1D( m_puiHistogram );
m_puiHistogram = NULL;
}
// statistics