Commit Graph

597 Commits

Author SHA1 Message Date
Jonathan Thomas
ef80439b62 Merge pull request #530 from ferdnyc/omp-and-ffmpeg-classes
Move off deprecated OpenMP API, fix FFmpeg code paths
2020-10-16 14:45:20 -05:00
Jonathan Thomas
8cf0483bd9 Merge pull request #455 from ferdnyc/remove-ancient-ffmpeg-encode
FFMpegWriter: Ease technical debt by dropping support for FFmpeg versions below 2.4
2020-10-16 03:14:26 -05:00
Jonathan Thomas
143b948ac2 Merge branch 'develop' into distinct-saturation 2020-10-16 02:47:40 -05:00
FeRD (Frank Dana)
a004bd23f3 Merge remote-tracking branch 'upstream/develop' into remove-ancient-ffmpeg-encode 2020-10-13 07:00:58 -04:00
Frank Dana
22f89680bd Merge pull request #555 from ferdnyc/fix-deprecated-endl
Use Qt::endl with QTextStream
2020-09-10 19:16:40 -04:00
Frank Dana
131e441d98 Merge pull request #563 from ferdnyc/timeline-lookup-api
Timeline: Add clip/effect lookup api, GetMaxFrame/GetMaxTime method (w/ unit tests)
2020-09-10 19:06:44 -04:00
Frank Dana
f33d5cb261 Timeline.h: Formatting 2020-09-10 18:40:32 -04:00
Jonathan Thomas
6cc00d6e47 Merge pull request #371 from SuslikV/lossless-color-format
Use non-subsampled color format for lossless encoding with the h264 encoder
2020-09-10 17:40:14 -05:00
FeRD (Frank Dana)
41af336d11 Add GetMaxTime 2020-09-02 01:04:29 -04:00
FeRD (Frank Dana)
f49a795749 Timeline: Add id-lookup API and GetMaxFrame 2020-09-01 23:05:04 -04:00
FeRD (Frank Dana)
36dab0b1db Clip: GetEffect implementation 2020-09-01 23:05:04 -04:00
FeRD (Frank Dana)
466f8713aa Timeline.h: Add lots of openshot:: prefixes 2020-09-01 23:05:04 -04:00
FeRD (Frank Dana)
bd90b8d6c9 ReaderBase: Deprecate SetClip/GetClip names
- Replacement method names are SetParentClip/GetParentClip
- Old names are retained as deprecated alternates, for now
- libopenshot internal calls (very few) are updated

ReaderBase.cpp: Remove (Set,Get)Clip
2020-09-01 23:05:04 -04:00
FeRD (Frank Dana)
92293d39ab Add QtUtilities.h header 2020-08-20 15:26:53 -04:00
FeRD (Frank Dana)
0e2f1eaba6 Include Qt header for Qt::endl 2020-08-20 14:53:16 -04:00
Frank Dana
174d0952ac Merge branch 'develop' into remove-ancient-ffmpeg-encode 2020-08-08 04:13:07 -04:00
FeRD (Frank Dana)
6b94dbb9dd Replace C compatibility headers with C++ 2020-08-07 02:02:05 -04:00
FeRD (Frank Dana)
cdd2efd32b Replace math.h header with cmath 2020-08-06 21:31:21 -04:00
Frank Dana
6638f4184c Merge pull request #475 from ferdnyc/ffmpeg-writer
Memory-safety fixes to FFmpegWriter, FrameMapper, DummyReader
2020-07-11 23:39:52 -04:00
Frank Dana
2520996d85 Merge pull request #510 from ferdnyc/store-qt-version
Add version/feature #defines to OpenShotVersion.h
2020-07-08 17:28:18 -04:00
Frank Dana
adab668486 Merge branch 'develop' into ffmpeg-writer 2020-07-08 17:26:38 -04:00
Frank Dana
687a9cc894 Merge pull request #533 from musteresel/improve-dummyreader-doc
Add a note about the buffering behavior of Timeline to DummyReader
2020-07-08 17:20:55 -04:00
Frank Dana
001b2d8a71 MagickUtils: Add #pragma to silence IM6 warning 2020-06-18 05:47:40 -04:00
Daniel Jour
bec21b1c77 Add a note about the buffering behavior of Timeline to DummyReader
Using DummyReader with a custom cache with a Timeline can lead to
strange exceptions due to Timeline's buffering.  Therefore adding a
note to the DummyReader documentation about that.
2020-06-12 22:30:54 +02:00
FeRD (Frank Dana)
8af624fc4e Add an APPIMAGE_BUILD option to libopenshot
- Defaults OFF, must be enabled during build generation
- Set (cmake -DAPPIMAGE_BUILD=1) by GitLab linux builder
- Stored as a symbol in the library (via OpenShotVersion.h #defines)
- Also visible in Python module (`if openshot.APPIMAGE_BUILD: pass`)

Also, use CMAKE_SWIG_FLAGS properly (as a list), fix some indentation
2020-06-11 17:40:53 -04:00