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
1,510 Commits 9 Branches 27 Tags
e39a1fc809d21d64ef8b96fcba6b56f554ccb550
Commit Graph

1510 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Christoph Willing
e39a1fc809 Resolve ambiguous abs() call 
Signed-off-by: Christoph Willing <chris.willing@linux.com>
 2020-02-10 18:28:56 +10:00
Jonathan Thomas
56af4eb141 Merge pull request #431 from OpenShot/merge-master-into-develop 
Merge master into develop (take 2)
 2020-02-08 17:42:14 -06:00
Jonathan Thomas
25607b7d0b Merge branch 'master' into merge-master-into-develop 
# Conflicts:
#	CMakeLists.txt
 2020-02-08 17:25:59 -06:00
Jonathan Thomas
63e28a07de Merge pull request #407 from OpenShot/release-20200105 
Release of libopenshot 0.2.4 (SO 18)
v0.2.4 		2020-02-08 15:19:34 -06:00
Jonathan Thomas
eb701a5f08 Merging this PR from https://github.com/OpenShot/libopenshot/pull/416 into release branch. Tested locally and did not see any crazy memory demands from this. 2020-02-07 17:33:54 -06:00
Jonathan Thomas
51cf3305d3 Merge pull request #416 from ferdnyc/preview-cache-size 
Raise preview cache to CPUs*8 frames, max 64
 2020-02-07 17:32:56 -06:00
FeRD (Frank Dana)
3321042672 Raise preview cache to CPUs*8 frames, max 64 2020-01-14 00:47:02 -05:00
Frank Dana
49972b21e9 Merge pull request #415 from ferdnyc/coverage-build 
Use Codecov.io for coverage reporting
 2020-01-12 11:56:49 -05:00
FeRD (Frank Dana)
6b16162b26 Reorder Travis matrix 2020-01-12 08:53:19 -05:00
FeRD (Frank Dana)
6d95bcef12 Configuration for Codecov 2020-01-12 08:47:08 -05:00
Frank Dana
585774be26 Merge branch 'develop' into coverage-build 2020-01-12 06:29:48 -05:00
Frank Dana
0bc87c00bc Merge pull request #414 from ferdnyc/resvg-image-format 
FindRESVG: Remove debugging messages
 2020-01-12 06:23:13 -05:00
FeRD (Frank Dana)
c83c098bc5 Use Codecov.io for coverage reporting 2020-01-12 06:22:32 -05:00
FeRD (Frank Dana)
f801af26e5 FindRESVG: Remove debugging messages 2020-01-12 05:29:16 -05:00
FeRD (Frank Dana)
8c53f25091 FindRESVG: Remove debugging messages 2020-01-12 05:27:17 -05:00
Frank Dana
028bafc658 Merge pull request #410 from OpenShot/resvg-image-format 
Fix Resvg image format
 2020-01-12 05:21:22 -05:00
Frank Dana
c8be3354d5 Merge pull request #412 from ferdnyc/travis-jsoncpp 
Travis: Add libjsoncpp-dev to apt package list
 2020-01-12 05:20:14 -05:00
FeRD (Frank Dana)
43ff40cf27 Travis: Add libjsoncpp-dev to apt package list 2020-01-11 21:42:15 -05:00
FeRD (Frank Dana)
63baee14b9 Define USE_RESVG for openshot target 2020-01-11 19:28:00 -05:00
FeRD (Frank Dana)
48fc7de326 Fix RESVG format in GetFrame 2020-01-11 19:27:53 -05:00
FeRD (Frank Dana)
175062913d Define USE_RESVG for openshot target 2020-01-11 18:11:02 -05:00
FeRD (Frank Dana)
fa9189a96a Fix RESVG format in GetFrame 2020-01-11 17:59:03 -05:00
FeRD (Frank Dana)
08add08378 Fix FindRESVG for Windows 2020-01-09 02:14:20 -05:00
FeRD (Frank Dana)
a8b65f57ea Merge branch 'find-resvg' into resvg-image-format 2020-01-09 02:11:35 -05:00
FeRD (Frank Dana)
290c7a7e84 Fix FindRESVG for Windows 2020-01-09 01:59:26 -05:00