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/DecklinkOutput.cpp
View File

@@ -195,7 +195,7 @@ void DeckLinkOutputDelegate::ScheduleNextFrame(bool prerolling)
}
void DeckLinkOutputDelegate::WriteFrame(tr1::shared_ptr<openshot::Frame> frame)
void DeckLinkOutputDelegate::WriteFrame(std::shared_ptr<openshot::Frame> frame)
{
#pragma omp critical (blackmagic_output_queue)
@@ -220,7 +220,7 @@ void DeckLinkOutputDelegate::WriteFrame(tr1::shared_ptr<openshot::Frame> frame)
while (!raw_video_frames.empty())
{
// Get front frame (from the queue)
tr1::shared_ptr<openshot::Frame> frame = raw_video_frames.front();
std::shared_ptr<openshot::Frame> frame = raw_video_frames.front();
raw_video_frames.pop_front();
// copy of frame count