Merge branch 'dev_modules_api'
Conflicts: source/PlaYUVerFrame.h
This commit is contained in:
commit
d83eca0120
16 files changed
+695
-67
No files matched your search
@@ -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
|
||||
|
||||
Reference in new issue
Block a user