Commit Graph

1568 Commits

Author SHA1 Message Date
FeRD (Frank Dana)
3a88d21866 FFmpegWriter: Drop ancient FFmpeg code
- Drop any FFmpeg version checks for versions older than 2.6
- Remove code that was only used in FFmpeg 2.4 or lower
- Add human-readable version comments to checks for 
LIBFOO_VERSION_MAJOR. etc.
2020-03-05 01:38:07 -05:00
FeRD (Frank Dana)
5764b03544 FFmpegWriter: Use std::clog for output
- Eliminate fprintf(stderr...) and non-threadsafe std::cerr
- Replace with thread-safe std:clog or ZeroMQ calls
- Clean up some formatting & ZeroMQ logging
2020-03-04 23:53:04 -05:00
Jonathan Thomas
f1e5c9c8a2 Merge pull request #454 from OpenShot/merge-master-to-develop1
Merge master into develop (and bump version to -dev2)
2020-03-03 03:00:23 -06:00
Jonathan Thomas
efe0728f2f Bump version to -dev2 (merge master back to develop) 2020-03-03 02:34:57 -06:00
Jonathan Thomas
4d7b389103 Merge branch 'master' into merge-master-to-develop1 2020-03-03 02:34:03 -06:00
Jonathan Thomas
d0e884df78 Merge pull request #452 from OpenShot/release-20200229
Release branch for libopenshot 0.2.5 (SO 19)
v0.2.5
2020-03-03 02:00:06 -06:00
Jonathan Thomas
1ced9d49f9 Merge branch 'release-20200229' of github.com:OpenShot/libopenshot into release-20200229 2020-03-02 23:50:28 -06:00
Jonathan Thomas
4d7b4072c3 Fixing abs -> fabs regression. Not sure how this worked before. 2020-03-02 23:50:10 -06:00
Frank Dana
7fbd44a0fa ColorShift: Use one-word name in EffectInfo (#453) 2020-03-02 23:14:20 -05:00
FeRD (Frank Dana)
0910f22359 Merge branch 'colorshift-name-sync' into release-20200229 2020-03-02 22:50:04 -05:00
FeRD (Frank Dana)
325c73abd7 ColorShift: Use one-word name in EffectInfo 2020-03-02 22:47:05 -05:00
Frank Dana
b724f2ef07 Merge pull request #400 from ferdnyc/add-features
CMake: Add Features for docs, unit tests
2020-03-01 20:38:30 -05:00
Frank Dana
600e8844ee Merge branch 'develop' into add-features 2020-03-01 19:50:52 -05:00
Jonathan Thomas
c7fe363f2b Fix ColorShift classname in EffectInfo::CreateEffect 2020-02-29 19:21:43 -06:00
Jonathan Thomas
8d78242571 Release branch for 0.2.5 (SO 19) 2020-02-29 17:30:36 -06:00
Jonathan Thomas
8b78ddf945 Merge pull request #451 from OpenShot/bump-version
Bump version to 0.2.5-dev1 (and libopenshot-audio dependency to 0.2.0)
2020-02-29 16:35:20 -06:00
Jonathan Thomas
5da706dc23 Bump dependency to OpenShotAudio to 0.2.0 2020-02-28 17:16:48 -06:00
Jonathan Thomas
2d471aea12 Bump version to 0.2.5-dev1 (SO 19) 2020-02-28 17:14:34 -06:00
Jonathan Thomas
4f591c7b94 Merge pull request #396 from ferdnyc/json-parsing
Behind-the-scenes code tidying for Json data handling
2020-02-27 15:32:05 -06:00
Jonathan Thomas
4ddf775cdf Merge pull request #421 from ferdnyc/ffmpegwriter-opts
FFmpegWriter: Overload Set___Options() methods
2020-02-27 15:27:31 -06:00
Jonathan Thomas
aa8c891ef8 Merge pull request #418 from ferdnyc/fix-AddImage-interlaced
Frame: Fix interlaced AddImage
2020-02-27 15:22:35 -06:00
Jonathan Thomas
6666702e80 Merge pull request #423 from ferdnyc/optimized-blur
Optimized, parallelized Blur effect
2020-02-27 15:19:25 -06:00
Jonathan Thomas
f9b4fe58b7 Merge pull request #424 from ferdnyc/optimized-brightness
Parallelize and streamline Brightness effect
2020-02-27 15:18:22 -06:00
Jonathan Thomas
4fc9e9db4c Merge pull request #425 from ferdnyc/optimized-wave
Streamline and parallelize Wave effect
2020-02-27 15:17:48 -06:00
Jonathan Thomas
ce39a53465 Merge pull request #426 from ferdnyc/pixelate-code
Rewrite of Pixelate effect
2020-02-27 15:17:19 -06:00