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,520 Commits 9 Branches 27 Tags
85ca6c574482002371bef4dbfb37fc2b6ff522cb
Commit Graph

1520 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
FeRD (Frank Dana)
85ca6c5744 CMake: Add features for docs, unit tests 
- A new CMake option, ENABLE_TESTS, is created and defaults ON
  (Legacy -DDISABLE_TESTS=1 on the command line will override)
- Target info for docs and tests is shown in the FeatureSummary
 2020-02-26 05:26:00 -05:00
Frank Dana
fe8ea216f4 Merge pull request #437 from ferdnyc/hw-accel-ffmpeg34 
Limit HW accel support to FFmpeg 3.4+
 2020-02-14 12:11:09 -05:00
Frank Dana
99fda01352 Merge pull request #442 from ferdnyc/no-inline-cpp-2 
Add -no-integrated-cpp for G++ < 9
 2020-02-13 03:43:10 -05:00
FeRD (Frank Dana)
61366ca787 Add -no-integrated-cpp for G++ < 9 2020-02-12 21:28:55 -05:00
Frank Dana
3d6958d125 Merge pull request #439 from cwilling/develop 
Replace ambiguous abs() call with fabs()
 2020-02-12 20:34:22 -05:00
Frank Dana
9bb5d93147 Merge pull request #440 from albert-github/feature/bug_docu 
Documentation error
 2020-02-10 12:52:00 -05:00
albert-github
ba1155e44f Documentation error 
Correcting small documentation error.
 2020-02-10 15:35:58 +01:00
Christoph Willing
e39a1fc809 Resolve ambiguous abs() call 
Signed-off-by: Christoph Willing <chris.willing@linux.com>
 2020-02-10 18:28:56 +10:00
FeRD (Frank Dana)
4106b99164 Travis: Add FFmpeg 3.2 build 2020-02-10 02:09:32 -05:00
FeRD (Frank Dana)
023f5df512 doc/HW-ACCEL: List 3.4 as minimum FFmpeg version 2020-02-10 01:59:25 -05:00
FeRD (Frank Dana)
e74d71f545 FFmpegReader/Writer: limit hwaccel to FFmpeg 3.4+ 
Add a new #define HAVE_HW_ACCEL, which is only set on FFmpeg 3.4+,
and use that to restrict the use of hw-accel features, leaving
IS_FFMPEG_3_2 to determine only whether code is compatible with
FFmpeg 3.2+.
 2020-02-10 01:50:31 -05: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