Jonathan Thomas
eae3fb130d
Adding in a limit on video playback sleep, so we don't get a huge, runaway wait time. Also adding in a kill time when shutdown threads (so we don't wait indefinitely for them to stop)
2021-11-04 17:33:14 -05:00
Frank Dana
aee3a44b5b
CI: Avoid always recompiling Resvg ( #772 )
2021-11-03 09:13:13 -04:00
Frank Dana
f7cebb7f22
Merge pull request #767 from troyrollo/imagemagick-cassert-error-workaround
...
Avoid a bug in ImageMagick or cassert headers
2021-11-02 06:37:28 -04:00
FeRD (Frank Dana)
fe58e8028d
Move some headers around
2021-11-01 11:04:31 -04:00
Troy Rollo
233d555052
Avoid a bug in ImageMagick or cassert headers
...
At least on Debian bullseye as at today, the ImageMagick headers
include <cassert> with an ImageMagick namespace current. <cassert>
and the headers it then pulls in also do not set the namespace.
Those headers then declare functions such as __assert_fail, which
end up in the ImageMagick namespace. This causes failures in other
parts of the build, such as the ZeroMQ code. This seems to be a
bug in either the ImageMagick headers or the <cassert> header, but
can be easily worked around by including <cassert> before any
ImageMagick header. This change does so.
2021-10-31 19:47:29 -04:00
Frank Dana
974df9961a
CI: Fix Resvg branch selection ( #770 )
...
* Fix Resvg branch selection
* Add detail to cache keys
2021-10-31 19:22:55 -04:00
Frank Dana
2a0076ca8f
tests/Crop: Add license metadata ( #769 )
2021-10-31 10:04:51 -04:00
Jonathan Thomas
f81f620c2a
Merge pull request #732 from ferdnyc/crop-qpainter
...
Rewrite Crop effect using QPainter
2021-10-29 13:17:38 -05:00
Jonathan Thomas
bbbb72aa5d
Merge pull request #757 from ferdnyc/resvg-in-ci
...
Resvg: Add support for v0.11.0+, enable in GitHub CI
2021-10-28 21:31:58 -05:00
Jonathan Thomas
0add6f892c
Merge pull request #766 from OpenShot/fix-windows-x86-path
...
Fix babl builds on Windows by setting the babl_DIR CMake variable
2021-10-28 18:59:24 -05:00
Jonathan Thomas
54c2a800eb
Updating docs for babl INSTALL
2021-10-28 18:08:47 -05:00
Jonathan Thomas
88a70804c1
Removing env variable as it's not needed
2021-10-28 18:00:32 -05:00
Jonathan Thomas
5bb56482fb
Setting babl_DIR as Cmake variable
2021-10-28 17:54:59 -05:00
Jonathan Thomas
ad058b5aa2
Setting babl_DIR environment variable
2021-10-28 17:46:04 -05:00
Jonathan Thomas
5a33edf855
Experimental test to add mingw32/lib folder to path for babl support
2021-10-28 17:34:24 -05:00
Jonathan Thomas
689341368f
Merge pull request #716 from troyrollo/babl-integration
...
Add support for more Chroma Key methods
2021-10-28 14:32:16 -05:00
Jonathan Thomas
5f89107487
Merge pull request #712 from ferdnyc/color-qcolor-ctor
...
Color: Add Color(QColor) constructor with unit test, move initialization into initializer lists
2021-10-27 13:42:12 -05:00
Jonathan Thomas
1b5739f0ea
Merge pull request #763 from ferdnyc/fix-has-video
...
Clip: Fix has_video, add unit test
2021-10-27 13:31:58 -05:00
Frank Dana
311d86957e
Include FFmpegUtilities.h earlier ( #764 )
2021-10-27 06:49:27 -04:00
FeRD (Frank Dana)
b1d98d8de1
Color: Add Color(QColor) ctor, with unit test
2021-10-27 01:38:22 -04:00
FeRD (Frank Dana)
9133389b92
Clip: Fix has_video, add unit test
2021-10-27 00:26:56 -04:00
Frank Dana
b9833b71ab
Merge pull request #687 from ferdnyc/timeline-inheritance
...
Fix inheritance of TimelineBase::Clips(), and add unit test
2021-10-24 02:19:19 -04:00
Frank Dana
f26a574bf2
Only duplicate Settings test involving envvar ( #762 )
2021-10-24 01:07:03 -04:00
Frank Dana
b1b1045af8
Merge pull request #729 from ferdnyc/move-proto-build
...
Fold libopenshot_protobuf into libopenshot
2021-10-22 15:22:35 -04:00
FeRD (Frank Dana)
5c8ee393a6
Findbabl: Add license headers
2021-10-22 15:20:50 -04:00
