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

4
src/DummyReader.cpp
View File

@@ -78,7 +78,7 @@ void DummyReader::Open() throw(InvalidFile)
if (!is_open)
{
// Create or get frame object
image_frame = tr1::shared_ptr<Frame>(new Frame(1, info.width, info.height, "#000000", info.sample_rate, info.channels));
image_frame = std::make_shared<Frame>(1, info.width, info.height, "#000000", info.sample_rate, info.channels);
// Mark as "open"
is_open = true;
@@ -97,7 +97,7 @@ void DummyReader::Close()
}
// Get an openshot::Frame object for a specific frame number of this reader.
tr1::shared_ptr<Frame> DummyReader::GetFrame(long int requested_frame) throw(ReaderClosed)
std::shared_ptr<Frame> DummyReader::GetFrame(long int requested_frame) throw(ReaderClosed)
{
// Check for open reader (or throw exception)
if (!is_open)