Merge branch 'develop' into opencv

This commit is contained in:
Jonathan Thomas
2020-09-23 14:44:53 -05:00
29 changed files with 583 additions and 245 deletions

View File

@@ -30,6 +30,9 @@
#include "../include/Frame.h"
#include <thread> // for std::this_thread::sleep_for
#include <chrono> // for std::chrono::milliseconds
using namespace std;
using namespace openshot;
@@ -1079,7 +1082,7 @@ void Frame::Play()
while (transport1.isPlaying())
{
cout << "playing" << endl;
usleep(1000000);
std::this_thread::sleep_for(std::chrono::seconds(1));
}
cout << "DONE!!!" << endl;