openshot/libopenshot
0
0
Fork 0
mirror of https://github.com/OpenShot/libopenshot.git synced 2026-03-02 08:53:52 -08:00
Code Issues Packages Projects Releases Wiki Activity

Resolving conflicts

Browse Source
This commit is contained in:
Brenno
2020-10-20 01:04:59 -03:00
parent 1626e1eeba
commit a9274df96b
30 changed files with 314 additions and 351 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/Frame.cpp
View File

@@ -939,6 +939,7 @@ std::shared_ptr<QImage> Frame::GetImage()
}
#ifdef USE_OPENCV
// Convert Qimage to Mat
cv::Mat Frame::Qimage2mat( std::shared_ptr<QImage>& qimage) {