FeRD (Frank Dana)
7e2f26d6fe
use/create jsoncpp_lib target
2019-10-10 18:38:46 -04:00
FeRD (Frank Dana)
d768c89ad7
Merge branch 'develop' into openmp-required
2019-10-08 16:33:35 -04:00
FeRD (Frank Dana)
582a76a8a7
CMake: REQUIRE OpenMP, use (or create) targets
...
OpenMP is now REQUIRED as the build will fail if it's not available.
This PR updates the `find_package`, and creates the necessary targets
for older CMake versions (3.9+ will do it automatically).
The targets are then made PUBLIC dependencies of the openshot
target, which causes the OpenMP configs to automatically propagate.
The redundant OpenMP detection is removed from test/CMakeLists.txt.
The detection code comes verbatim from this post, which also credits
Modern CMake: https://iscinumpy.gitlab.io/post/omp-on-high-sierra/
2019-10-08 16:30:10 -04:00
FeRD (Frank Dana)
798dcafb65
CMake: Set required FFMpeg libs
2019-10-08 09:48:04 -04:00
FeRD (Frank Dana)
43efabf102
Qt/Video*Thread: ZMQ argument stragglers
2019-10-07 13:34:02 -04:00
FeRD (Frank Dana)
7a9567e7ab
Reverse JsonCpp logic, prefer system-installed
2019-10-03 02:50:39 -04:00
FeRD (Frank Dana)
aa5247b91a
Bindings: Pick up include dirs from targets
2019-10-03 02:48:32 -04:00
FeRD (Frank Dana)
655b137ee2
Bindings: Pick up include dirs from targets
2019-10-02 09:30:06 -04:00
FeRD (Frank Dana)
6502c2a6b2
CMake: Link with FFmpeg:: targets
2019-10-02 09:29:15 -04:00
Frank Dana
b7c96ffe21
Merge pull request #336 from ferdnyc/compactdefaultargs
...
SWIG: Use compactdefaultargs in bindings
2019-10-02 03:37:16 -04:00
Frank Dana
335c0cba1f
Merge pull request #303 from ferdnyc/use-std-stoll
...
Use std::stoll to convert JSON values
2019-10-02 01:29:59 -04:00
FeRD (Frank Dana)
e070d04796
FFmpegReader::CheckMissingFrame std::map tweaks
2019-10-02 00:18:47 -04:00
FeRD (Frank Dana)
1435267b62
Add lock to CreateFrame (patch by laochen, #272 )
2019-10-01 23:27:36 -04:00
FeRD (Frank Dana)
1af92afc59
SWIG: Use compactdefaultargs in bindings
2019-09-28 21:43:59 -04:00
FeRD (Frank Dana)
ee4666f15b
Fix indentation
2019-09-25 05:53:00 -04:00
FeRD (Frank Dana)
986f567ebf
CMake: Eliminate duplicate include dirs
2019-09-25 01:22:53 -04:00
FeRD (Frank Dana)
0658134df0
CMake: Add FeatureSummary
2019-09-25 01:11:30 -04:00
FeRD (Frank Dana)
1ec431f446
Simplify CMakeLists with loops
2019-09-25 01:05:59 -04:00
Frank Dana
9e0d194072
Add comment re: updates to interlace params
2019-09-22 01:37:32 -04:00
Jeff Shillitto
33f16d3a55
Use QFont instead of setting parameters
2019-09-21 21:11:29 +10:00
FeRD (Frank Dana)
ba86744e6a
Use OPENSHOT_VERSION_FULL as Python str()
2019-09-21 02:03:07 -04:00
FeRD (Frank Dana)
c422f4f245
Separate GetVersion impl, make Pythonic
2019-09-21 01:43:30 -04:00
FeRD (Frank Dana)
6aebb10cea
More explicit prefixing in Qt/ and Player classes
2019-09-21 00:14:32 -04:00
Jeff Shillitto
738dd62132
Enable background fill color to be set behind text
2019-09-20 22:10:07 +10:00
Jeff Shillitto
c8b5300df3
Allow font bold and italic properties to be set
2019-09-20 21:25:09 +10:00
