Jonathan Thomas
aecf7d96cb
Merge branch 'develop' into feature/support-custom-branches-in-gitlab
2018-06-06 14:52:17 -05:00
Jonathan Thomas
b801907217
Integrate custom libopenshot branches into GitLab build pipeline. Also, download previous artifacts from same branch name, and default to develop if not found.
2018-06-06 14:48:58 -05:00
Jonathan Thomas
c175a345c2
Merge pull request #107 from OpenShot/bugfix/mask-windows-crash
...
Move critical sections to prevent crash on Windows
2018-06-06 13:45:55 -05:00
Jonathan Thomas
ace89efa59
Move critical sections to prevent crash on Windows
2018-06-06 06:31:46 -05:00
Jonathan Thomas
d0b5ae52be
Merge pull request #104 from OpenShot/bugfix/prevent-negative-start-sample
...
Prevent a negative starting sample when adding audio to a frame
2018-06-06 03:59:15 -05:00
Jonathan Thomas
032714316d
Prevent a negative starting sample when adding audio to a frame
2018-06-06 03:56:02 -05:00
Jonathan Thomas
bbbf42aeab
Merge pull request #100 from OpenShot/bugfix/fixing-audio-pops-due-to-resampling
...
Fixing audio pops due to resampling (this fixes a bunch of audio popping-related bugs). Now Frame objects track their own max_audio_sample_count, as we add audio data... so we have an accurate bounds on each frame.
2018-05-30 03:27:29 -05:00
Jonathan Thomas
bc5607910d
Fixing audio pops due to resampling (this fixes a bunch of audio popping-related bugs). Now Frame objects track their own max_audio_sample_count, as we add audio data... so we have an accurate bounds on each frame.
2018-05-30 03:20:31 -05:00
Jonathan Thomas
704d9ea530
Merge pull request #99 from OpenShot/bugfix/dont-remove-nearby-old-working-frame
...
Don't remove nearby working frames
2018-05-27 00:19:39 -05:00
Jonathan Thomas
a4c1b818ba
Don't remove nearby working frames (trying to catch less things in our too old logic). This prevents lots of invalid cache situations during preview.
2018-05-27 00:12:50 -05:00
Jonathan Thomas
a67583a2e1
Merge pull request #96 from OpenShot/bugfix/copy-time-mapped-image
...
Make copy of time-mapped image data (transformed, passed to effects, etc...), to prevent flickering or crashes.
2018-05-25 00:38:45 -05:00
Jonathan Thomas
93c2c0247a
Make copy of time mapped image data, so those frames can be manipulated (transformed, passed to effects, etc...)
2018-05-25 00:34:29 -05:00
Jonathan Thomas
9d7efcd896
Merge pull request #95 from OpenShot/feature/remove-duplicate-make-command
...
Experimental: remove additional make command
2018-05-24 15:22:25 -05:00
Jonathan Thomas
1e58f7296e
Experimental remove additional make command, so it only compiles for Windows 1 time
2018-05-24 14:32:15 -05:00
Jonathan Thomas
2d81121dea
Merge pull request #93 from OpenShot/feature/refactor-gitlab-ci
...
Refactor of GitLab Ci
2018-05-24 03:31:59 -05:00
Jonathan Thomas
7adfdf4669
Another small syntax change to gitlab ci
2018-05-24 03:26:39 -05:00
Jonathan Thomas
1038fc4f1d
Another small syntax change to gitlab ci
2018-05-24 03:22:10 -05:00
Jonathan Thomas
954455e9ab
Another small syntax change to gitlab ci
2018-05-24 03:14:24 -05:00
Jonathan Thomas
4706efe68c
Refactor of GitLab Ci
2018-05-24 03:09:42 -05:00
Jonathan Thomas
ae4551e95d
Improving gitlab build integration
2018-05-22 22:05:01 -05:00
Jonathan Thomas
98fa55feb3
Updating cmake file for libopenshot-audio to search $ENV first, and then static folders
2018-05-21 23:12:21 -05:00
Jonathan Thomas
4595cd8899
Integrating experimental gitlab CI file
2018-05-21 22:52:04 -05:00
Jonathan Thomas
b5704c4a25
Merge pull request #92 from OpenShot/revert-86-ZmgLogger_hires_timestamp
...
Revert "Check in code to handle missing clock_gettime() on most versions of M…"
2018-05-19 01:25:00 -05:00
Jonathan Thomas
9d755c6d68
Revert "Check in code to handle missing clock_gettime() on most versions of M…"
2018-05-19 01:24:24 -05:00
Jonathan Thomas
b54e1dd88f
Merge pull request #86 from N3WWN/ZmgLogger_hires_timestamp
...
Check in code to handle missing clock_gettime() on most versions of M…
2018-05-18 13:03:23 -05:00