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
Jonathan Thomas
4ed575f1bb
Merge pull request #539 from eisneinechse/bitratecorrect
...
Bitratecorrect
2020-07-08 02:32:00 -05:00
Jonathan Thomas
a0cfe2e185
Merge pull request #540 from OpenShot/mac-catalina-changes
...
MacOS Catalina Support + _CXX11 + GCC 8.4
2020-07-08 02:29:26 -05:00
eisneinechse
6114be5e0f
Fixed typo
2020-07-07 10:20:48 -07:00
eisneinechse
9ef8f8478e
Formating
2020-07-07 10:14:02 -07:00
Jonathan Thomas
aac43ec038
Removing commented out code
2020-07-07 02:34:11 -05:00
Jonathan Thomas
6e6b60fa22
Experimental ABI fix to deal with '__cxx11' (take 2)
2020-07-06 02:33:26 -05:00
Jonathan Thomas
b7dd86e63a
Experimental ABI fix to deal with '__cxx11'
2020-07-06 02:10:35 -05:00
Jonathan Thomas
d2dd3d3e3f
Experimenting with new include folder, since Catalina doesn't have a /usr/include/
2020-07-05 21:46:40 -05:00
Jonathan Thomas
bfefe501d0
Experimenting with Cmake and Threads failure
2020-07-05 21:09:31 -05:00
Jonathan Thomas
7b322a0948
Making CMake Threads not required.
2020-07-05 20:51:18 -05:00
Jonathan Thomas
accc5a8deb
Updating to gcc 8.4 for MacOS Catalina
2020-07-05 20:45:41 -05:00
eisneinechse
3157d75747
Leave the values for qmin and qmax at their default values except
...
for mpeg2. Changing them for the other codecs resultet in exporting
with the wrong bitrate.
2020-07-02 16:54:32 -07:00
eisneinechse
f66010948d
Merge pull request #1 from OpenShot/develop
...
Update fork
2020-06-27 12:01:30 -07:00
Frank Dana
517f2896d1
Merge pull request #535 from OpenShot/ferdnyc-patch-1
...
MagickUtils: Add #pragma to silence IM6 warning
2020-06-18 06:04:32 -04:00
Frank Dana
001b2d8a71
MagickUtils: Add #pragma to silence IM6 warning
2020-06-18 05:47:40 -04:00
Jonathan Thomas
73d1689414
Merge pull request #525 from eisneinechse/develop
...
Improvements to handling of new codecs
2020-06-15 18:49:16 -05:00
eisneinechse
056a72fa17
Fix indentation (2)
2020-06-15 14:41:38 -07:00
eisneinechse
3dfcea1dd5
Fix indentation
2020-06-15 14:33:14 -07:00
Jonathan Thomas
c90eecf9ae
Merge pull request #526 from OpenShot/codacy-improvements
...
WIP: Changing some libopenshot code based on Codacy feedback
2020-06-15 16:13:04 -05:00
eisneinechse
c037d5c01d
Update src/FFmpegWriter.cpp
...
We might want to leave some kind of comment though. The encoders will (probably) get these options (soon).
Co-authored-by: Jonathan Thomas <jonathan@openshot.org >
2020-06-15 14:07:09 -07:00
eisneinechse
bf0e700ae7
Update src/FFmpegWriter.cpp
...
Co-authored-by: Jonathan Thomas <jonathan@openshot.org >
2020-06-15 14:05:43 -07:00
eisneinechse
2491d402df
Update src/FFmpegWriter.cpp
...
I should take more care of the comments.
Co-authored-by: Jonathan Thomas <jonathan@openshot.org >
2020-06-15 14:04:49 -07:00
eisneinechse
91647e6d0b
Update src/FFmpegWriter.cpp
...
Perfect. I forgot that comment.
Co-authored-by: Jonathan Thomas <jonathan@openshot.org >
2020-06-15 14:03:29 -07:00
