Merge branch 'master' into featurePelFormatsApi
Conflicts: source/app/ViewArea.cpp source/lib/PlaYUVerFrame.cpp source/lib/PlaYUVerFrame.h
This commit is contained in:
commit
abdadeb22e
3 files changed
+42
-8
No files matched your search
@@ -170,6 +170,7 @@ public:
|
||||
{
|
||||
return m_iPixelFormat;
|
||||
}
|
||||
Int getColorSpace() const;
|
||||
Int getNumberChannels() const
|
||||
{
|
||||
return m_iNumberChannels;
|
||||
|
||||
Reference in new issue
Block a user