Commit Graph

1702 Commits

Author SHA1 Message Date
Frank Dana
08550fa522 Drop QtMultimedia and QtMultimediaWidgets deps (#551)
(Not actually used.)
2020-08-10 16:08:11 -04:00
Frank Dana
729e349d62 Remove FFmpeg 3.2 from Travis matrix (#548) 2020-08-07 17:14:39 -04:00
Frank Dana
bf0159bbda Merge pull request #546 from ferdnyc/dump-thread-configs
CMake: Remove threading config variables
2020-07-28 11:28:41 -04:00
FeRD (Frank Dana)
b8e1aded67 CMake: Remove threading config variables
Using FindThreads and the Threads::Threads target directly was
causing problems, and OpenMP seems to handle all this itself now.
2020-07-26 22:37:12 -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
8cc33b2e57 Merge pull request #542 from ferdnyc/store-qt-version
Enable IN_LIST in older CMake
2020-07-08 18:04:14 -04:00
FeRD (Frank Dana)
85b6a96725 Enable IN_LIST in older CMake 2020-07-08 17:56:08 -04:00
Frank Dana
ca31359327 FFmpegWriter: Missed 1 rename to video_codec_ctx 2020-07-08 17:39:04 -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
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