Merge branch 'fixSelectionToolUsage' into featurePelFormatsApi

Conflicts:
	source/lib/PlaYUVerFrame.cpp
This commit is contained in:
jfmcarreira committed 2014-10-27 00:15:53 +00:00
commit 3baa6775e5
9 files changed
+126 -71

No files matched your search

+1
View File
@@ -201,6 +201,7 @@ private:
Pel*** m_pppcInputPel;
UChar* m_pcRGBPelInterlaced;
Void adjustSelectedAreaDims( QRect &area, Int pel_format );
Void init( UInt width, UInt height, Int pel_format );
Void openPixfc();
Void closePixfc();