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,363 Commits 9 Branches 27 Tags
272f004c0e2c75c94de95135d0c484134bc8f45f
Commit Graph

1363 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Frank Dana
a79ffb6008 Merge branch 'develop' into threading-target 2019-10-30 03:20:54 -04:00
Frank Dana
afc8974451 Merge pull request #354 from ferdnyc/iwyu-cmd-fix 
CMake: Fix IWYU invocation with unset IWYU_OPTS
 2019-10-30 03:16:58 -04:00
FeRD (Frank Dana)
f09ac1bcc3 CMake: Fix IWYU invocation with unset IWYU_OPTS 2019-10-30 03:02:10 -04:00
Frank Dana
cbdd02fe7a Merge branch 'develop' into std-prefixes 2019-10-29 20:45:08 -04:00
Frank Dana
76725d9d2e Merge pull request #305 from jeffski/qt-text-html-readers 
QtTextReader and QtHtmlReader
 2019-10-29 20:40:51 -04:00
Jeff Shillitto
6c20fa43c2 Set HTML reader duration to 1 hour 
Co-Authored-By: Frank Dana <ferdnyc@gmail.com>
 2019-10-30 09:44:01 +11:00
Jeff Shillitto
21951bea5c Set duration to 1 hour 
Co-Authored-By: Frank Dana <ferdnyc@gmail.com>
 2019-10-30 09:43:31 +11:00
FeRD (Frank Dana)
60f6ad652a FFmpegWriter.cpp: add std:: prefixes 
New code added uses of `std::min`, `std::max`, `std::stoi`, and `std::pow`
 2019-10-29 16:31:36 -04:00
Frank Dana
969e8320e6 Merge branch 'develop' into std-prefixes 2019-10-29 16:06:55 -04:00
Jonathan Thomas
2a1fe80ee9 Merge pull request #352 from ferdnyc/clang-iwyu-fixes 
Add fixes for Clang/IWYU building, correct juce:: namespacing
 2019-10-29 14:03:57 -05:00
Jonathan Thomas
a3eb92e623 Merge pull request #340 from OpenShot/ffmpeg-targets 
FFmpeg: Create and use targets in CMake build
 2019-10-29 13:43:06 -05:00
Jonathan Thomas
3d44c774f1 Merge pull request #321 from ferdnyc/map-dicts 
WIP: Towards a more Pythonic openshot.Fraction
 2019-10-29 13:42:10 -05:00
Jonathan Thomas
066110c80f Merge pull request #313 from k3a/develop 
support for HEVC (and possibly more) HW VAAPI encoding
 2019-10-29 13:40:46 -05:00
Jonathan Thomas
0953293394 Merge pull request #290 from ferdnyc/restore-py-inst-path 
Python install path: remove site-packages detection
 2019-10-29 13:17:00 -05:00
FeRD (Frank Dana)
ed908faa46 Add ENABLE_IWTU CMake option 
Add CMake handling for `-DENABLE_IWYU=1" to enable scanning with
include-what-you-use (if `iwyu` binary is found in PATH), and e.g.
`-DIWYU_OPTS="--max_line_length=120 --verbose=1"` to supply args.
 2019-10-27 06:59:03 -04:00
FeRD (Frank Dana)
bcc62f900c Fix juce:: prefixing 2019-10-27 03:56:13 -04:00
FeRD (Frank Dana)
b6da6b9659 add DONT_SET_USING_JUCE_NAMESPACE to tests 2019-10-27 03:54:36 -04:00
FeRD (Frank Dana)
99b455a7aa Threads: Use IMPORTED target 2019-10-26 18:30:45 -04:00
Frank Dana
00fe96f6a7 Merge pull request #350 from ferdnyc/cmake-version-out 
Bump CMake min-version to 3.2, display during build
 2019-10-26 16:34:23 -04:00
Frank Dana
af83903162 Merge pull request #349 from ferdnyc/disable-tests 
DISABLE_TESTS covers entire tests/ dir
 2019-10-26 08:40:10 -04:00
FeRD (Frank Dana)
001cf00b80 Bump CMake min-version to 3.2, display 2019-10-26 08:29:19 -04:00
FeRD (Frank Dana)
a1034046a2 ZeroMQ: Use IMPORTED targets 
- Adopt FindZeroMQ.cmake from cppzmq, and use its `libzmq` target
- Also use `cppzmq` target, if created
 2019-10-26 07:24:28 -04:00
FeRD (Frank Dana)
645946458b DISABLE_TESTS covers entire tests/ dir 2019-10-26 07:22:01 -04:00
FeRD (Frank Dana)
e7a92a5389 Bindings: Pick up include dirs from targets 2019-10-26 06:43:34 -04:00
Frank Dana
178c8e2ba3 Merge pull request #346 from jeffski/fix-text-24hr-memory-issue 
Reduce duration of Image/Text Readers to 1 hour (#327)
 2019-10-25 13:57:31 -04:00