Merge branch 'master' into devel

This commit is contained in:
jfmcarreira committed 2017-09-20 19:18:45 +01:00
commit 0e4e3957fe
73 files changed
+1744 -1748

No files matched your search

+2 -2
View File
@@ -45,7 +45,7 @@ struct PlaYUVerFramePrivate;
*/
class PlaYUVerFrame
{
public:
public:
/** ColorSpace Enum
* List of supported pixel formats - do not change order
*/
@@ -276,7 +276,7 @@ class PlaYUVerFrame
/** @} */
private:
private:
PlaYUVerFramePrivate* d;
};