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

Migrating tr1 to std, adding C++11 support to build scripts, fixing crash in FFmpegReader (caused by shared_ptr, buffer, and last_video_frame corruption). Much improved stability with this change. Thanks to Craig and Peter for the help!

Browse Source
This commit is contained in:
Jonathan Thomas
2017-08-20 17:37:39 -05:00
parent 564664737a
commit f12ffe692b
84 changed files with 605 additions and 641 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/examples/ExampleBlackmagic.cpp
View File

@@ -29,7 +29,7 @@
#include <iostream>
#include <map>
#include <queue>
#include <tr1/memory>
#include <memory>
#include "../../include/OpenShot.h"
#include <omp.h>
#include <time.h>
@@ -99,7 +99,7 @@ int main(int argc, char *argv[])
int x = 0;
while (true)
{
tr1::shared_ptr<Frame> f = t.GetFrame(x);
std::shared_ptr<Frame> f = t.GetFrame(x);
if (f)
{
if (x != 0 && x % 30 == 0)
@@ -183,7 +183,7 @@ int main(int argc, char *argv[])
// Image Reader
// ImageReader r1("/home/jonathan/Pictures/Screenshot from 2013-02-10 15:06:38.png");
// r1.Open();
// tr1::shared_ptr<Frame> f1 = r1.GetFrame(1);
// std::shared_ptr<Frame> f1 = r1.GetFrame(1);
// r1.Close();
// f1->TransparentColors("#8fa09a", 20.0);
// f1->Display();
@@ -191,7 +191,7 @@ int main(int argc, char *argv[])
// ImageReader r2("/home/jonathan/Pictures/trees.jpg");
// r2.Open();
// tr1::shared_ptr<Frame> f2 = r2.GetFrame(1);
// std::shared_ptr<Frame> f2 = r2.GetFrame(1);
// r2.Close();
// DecklinkReader dr(1, 11, 0, 2, 16);
@@ -207,7 +207,7 @@ int main(int argc, char *argv[])
// if (x % 30 == 0)
// cout << "30 frames..." << endl;
//
// tr1::shared_ptr<Frame> f = dr.GetFrame(0);
// std::shared_ptr<Frame> f = dr.GetFrame(0);
// if (f)
// {
// //f->Display();