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

various fixes

Browse Source
This commit is contained in:
itsmattkc
2019-01-22 20:36:00 +11:00
parent d997bdb31d
commit d4d654203d
9 changed files with 71 additions and 88 deletions
Download Patch File Download Diff File Expand all files Collapse all files
playback/playback.cpp
+1 -3
View File
@@ -66,8 +66,6 @@ void open_clip(Clip* clip, bool multithreaded) {
}
void close_clip(Clip* clip, bool wait) {
// qDebug() << "closing" << clip->name;
clip->finished_opening = false;
// destroy opengl texture in main thread
@@ -284,7 +282,7 @@ void get_clip_frame(Clip* c, long playhead, bool& texture_failed) {
}
}
c->texture->setData(0, get_gl_pix_fmt_from_av(c->pix_fmt), QOpenGLTexture::UInt8, using_db_1 ? data_buffer_1 : data_buffer_2);
c->texture->setData(get_gl_pix_fmt_from_av(c->pix_fmt), QOpenGLTexture::UInt8, const_cast<const uint8_t*>(using_db_1 ? data_buffer_1 : data_buffer_2));
if (data_buffer_1 != target_frame->data[0]) {
delete [] data_buffer_1;