FeRD (Frank Dana)
e2b685de47
FindFFmpeg: Don't report missing components
...
find_package_handle_standard_args() will take care of that
2021-06-25 12:37:58 -04:00
FeRD (Frank Dana)
8f53e7e922
CMake: Adapt to FindFFmpeg.cmake changes
2021-06-25 11:49:49 -04:00
FeRD (Frank Dana)
93fb2eedf5
Enhance FindFFmpeg.cmake
...
- Add fallback component version parsing from the individual
<includedir>/<libname>/version.h headers
- Switch to FFmpeg_<component>_<property> variable names, standard
for CMake component variables
- No longer probe for non-requested components
- Use HANDLE_COMPONENT in find_package_handle_standard_args
- Parse, export overall FFmpeg_VERSION from libavutil/ffversion.h
2021-06-25 11:46:25 -04:00
Frank Dana
09eb807507
CMake: USE_SWIG_DEPENDENCIES for CMake 3.20+ ( #691 )
2021-06-25 01:05:59 -04:00
Frank Dana
d9ea98eb2d
tests: Make ImageWriter tests optional ( #685 )
...
Just like the OpenCV tests require OpenCV, the ImageWriter tests
require that ImageMagick be enabled in the build. If it isn't,
skip those tests.
2021-06-06 22:42:27 -04:00
Frank Dana
403d9a6697
Merge pull request #684 from ferdnyc/zombie-unit-test
...
CMake: Don't parallel-test on Windows, protect FFmpeg version checks
2021-06-06 22:40:42 -04:00
FeRD (Frank Dana)
8689b62304
Unit tests: Don't run in parallel on Windows
2021-06-06 20:04:37 -04:00
FeRD (Frank Dana)
9c9f5c8c53
CMake: Handle indeterminate FFMpeg HWAccel status
...
If we don't have a version number and can't conclusively determine
whether hwaccel is available, but the user hasn't disabled it
explicitly, just don't report its status at all. Better than
reporting it's disabled when that may not be true at all.
2021-06-06 05:21:01 -04:00
FeRD (Frank Dana)
6a373efc51
CMake: Protect against empty version vars
...
avcodec_VERSION and friends can be the empty string, on Windows
2021-06-06 04:11:32 -04:00
FeRD (Frank Dana)
1cee1394bf
Unit tests: Destroy zombie test
...
Somehow the old UnitTest++ version of tests/KeyFrame_Tests.cpp
got resurrected back into the repo. Shotgun blast to the head.
2021-06-06 03:48:47 -04:00
Frank Dana
8a81452bdf
Move FFmpeg hwaccel checks to CMake, eliminate #pragma messages ( #645 )
...
* Rename HAVE_HW_ACCEL to USE_HW_ACCEL
* CMake: Add USE_HW_ACCEL option, default on
* CMake: #define USE_HW_ACCEL, display as build feature
2021-06-04 21:32:29 -04:00
Frank Dana
5cca6d16ff
Merge pull request #683 from ferdnyc/non-abstract-effects
...
Non-abstract effects
2021-06-04 21:27:39 -04:00
FeRD (Frank Dana)
fcfb633061
Default virtual destructor for TrackedObjectBase
2021-06-04 20:10:47 -04:00
FeRD (Frank Dana)
8fab146f34
TrackedObject: DRY out with delegating ctors
2021-06-04 20:10:14 -04:00
FeRD (Frank Dana)
1edaf80153
TrackedObject: Pare down includes
2021-06-04 20:09:10 -04:00
FeRD (Frank Dana)
c04ce9dbe8
EffectBase: Fix JSON signatures
2021-06-04 20:07:19 -04:00
FeRD (Frank Dana)
5df3f8aef0
Add TrackedObjectBBase to Python SWIG
2021-06-04 20:05:32 -04:00
Frank Dana
6562824fb5
CMake: Drop minimum version to 3.10 ( #682 )
...
Partially reverts 7988f1a0b6
to restore compatibility with Ubuntu Bionic system CMake.
(However, the incompatibility between CMake < 3.12 and
the bundled jsoncpp build targets still exists, despite this change.)
2021-06-03 11:52:56 -04:00
Frank Dana
0b783ee507
Clip: Restore property choice names ( #681 )
2021-06-02 15:45:43 -04:00
Brenno A. C. Caldato
eb4e1a0073
Merge pull request #649 from OpenShot/effect-parenting
...
Effect parenting
2021-05-31 22:50:36 -03:00
Frank Dana
7988f1a0b6
CMake: Set minimum version to 3.12 ( #680 )
...
Using an OBJECT library to link the bundled jsoncpp into a SHARED
libopenshot fails with CMake versions up to 3.11.
2021-05-30 14:08:15 -04:00
Frank Dana
129619f49f
Clip: Mark GetFrame() override as such ( #679 )
2021-05-30 14:07:51 -04:00
Brenno
27eb0e6e23
Fixed Keyframe Test
2021-05-24 11:45:39 -03:00
Brenno
ae0a635716
removed assert from interpolation
2021-05-24 11:32:34 -03:00
Brenno
cd7d6fe00c
Merge remote-tracking branch 'origin/develop' into effect-parenting
2021-05-24 11:01:28 -03:00