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

Merge branch 'develop' into clip-refactor-keyframes

Browse Source
This commit is contained in:
FeRD (Frank Dana)
2020-10-19 16:28:49 -04:00
parent f4ae897240 07a447c920
commit a1e44edad4
192 changed files with 672 additions and 622 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/FFmpegReader.cpp
View File

@@ -31,7 +31,7 @@
* along with OpenShot Library. If not, see <http://www.gnu.org/licenses/>.
*/
#include "../include/FFmpegReader.h"
#include "FFmpegReader.h"
#include <thread> // for std::this_thread::sleep_for
#include <chrono> // for std::chrono::milliseconds