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

976 Commits

Author SHA1 Message Date
Jonathan Thomas
272f004c0e Merge pull request #296 from OpenShot/std-prefixes 
Remove all 'using namespace' directives from headers
 2019-11-17 16:18:14 -06:00
FeRD (Frank Dana)
c131c82be3 Reverse order of Python detection 
Detecting PythonLibs before PythonInterp can cause a non-default Python
library to be picked up, which then won't match the PythonInterp version
(which always matches the version of the `python3` command).
 2019-11-16 23:52:36 -05:00
SuslikV
87c06feda1 Clarify some comments 2019-11-02 20:04:58 +02:00
FeRD (Frank Dana)
75e9ba38e6 Merge remote-tracking branch 'upstream/develop' into std-prefixes 2019-11-01 19:59:57 -04:00
Frank Dana
de1327ca10 Fix Windows ZeroMQ for real (#357) 
* Rework FindZeroMQ again for Windows
* Let Windows auto-detect ZeroMQ path
 2019-11-01 19:37:13 -04:00
FeRD (Frank Dana)
d9f3a6b049 Fix ZeroMQ linking on Windows 2019-11-01 15:27:56 -04:00
Frank Dana
49c3708bf1 Merge branch 'develop' into threading-target 2019-11-01 14:51:54 -04:00
Frank Dana
5c40094c08 Merge branch 'develop' into zmq-targets 2019-11-01 14:42:08 -04:00
Frank Dana
04724cfcd7 Merge branch 'develop' into zmq-targets 2019-10-30 05:01:24 -04:00
FeRD (Frank Dana)
2535588ad8 Prefixing fixes for QtHtml/QtText Readers 2019-10-30 03:43:11 -04:00
Frank Dana
2560409bb5 Merge branch 'develop' into system-jsoncpp 2019-10-30 03:24:32 -04:00
Frank Dana
a79ffb6008 Merge branch 'develop' into threading-target 2019-10-30 03:20:54 -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