Merge branch 'dev_modules_api'

Conflicts:
	source/PlaYUVerFrame.h
This commit is contained in:
jfmcarreira committed 2014-03-22 16:11:12 +00:00
commit d83eca0120
16 files changed
+695 -67

No files matched your search

+2 -1
View File
@@ -103,7 +103,8 @@ public:
Bool writeFrame( const QString& filename );
Void getFrame( QImage *qimage );
PlaYUVerFrame* getFrame();
PlaYUVerFrame* getFrame( PlaYUVerFrame * );
#ifdef USE_OPENCV
cv::Mat getFrameCvMat();
#endif