oak-team/oak-editor
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

merged with master

Browse Source
This commit is contained in:
itsmattkc
2019-03-16 18:26:24 +11:00
parent 1889d423af 1d11e31029
commit 88f423fa84
289 changed files with 9643 additions and 7182 deletions
Download Patch File Download Diff File Expand all files Collapse all files
dialogs/exportdialog.cpp
+4 -4
View File
@@ -30,14 +30,14 @@
#include <QHBoxLayout>
#include <QPushButton>
#include "oliveglobal.h"
#include "global/global.h"
#include "dialogs/advancedvideodialog.h"
#include "panels/panels.h"
#include "ui/viewerwidget.h"
#include "rendering/renderfunctions.h"
#include "rendering/audio.h"
#include "io/exportthread.h"
#include "mainwindow.h"
#include "rendering/exportthread.h"
#include "ui/mainwindow.h"
extern "C" {
#include <libavformat/avformat.h>
@@ -545,7 +545,7 @@ void ExportDialog::export_action() {
connect(et, SIGNAL(finished()), this, SLOT(render_thread_finished()));
connect(et, SIGNAL(progress_changed(int, qint64)), this, SLOT(update_progress_bar(int, qint64)));
close_active_clips(olive::ActiveSequence);
close_active_clips(olive::ActiveSequence.get());
olive::Global->set_rendering_state(true);