Commit Graph

1656 Commits

Author SHA1 Message Date
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
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
eisneinechse
4e2c08db88 Update src/FFmpegWriter.cpp
Thanks for fixing that

Co-authored-by: Jonathan Thomas <jonathan@openshot.org>
2020-06-15 14:02:26 -07:00
eisneinechse
f4b40a4e77 Improvements to handling of new codecs 2020-06-04 08:28:33 -07:00
Jonathan Thomas
2834e7731b Merge pull request #445 from eisneinechse/develop
Newer codecs (svt_av1, rav1e, svt_hevc)
2020-06-02 14:50:01 -05:00
Jonathan Thomas
1cdb49f7a4 Merge pull request #520 from OpenShot/fix-fps-ffmpeg4
Fix FPS setting on FFmpeg 4
2020-06-02 14:28:09 -05:00
eisneinechse
d9e6af5cda Refert last commit 2020-06-02 11:35:07 -07:00
Jonathan Thomas
7ed26cf022 Replace _Pragma with #pragma
Co-authored-by: Frank Dana <ferdnyc@gmail.com>
2020-06-02 13:30:05 -05:00
eisneinechse
93d12e7f14 Include data for fps in clip created by ffmpeg 4+ 2020-06-02 08:53:39 -07:00
Frank Dana
782d764c68 Merge pull request #522 from ferdnyc/travis-focal-build
Travis: Switch to Ubuntu 20.04 Focal for FFmpeg 4 build
2020-06-01 23:02:37 -04:00
FeRD (Frank Dana)
511a6b1da2 Update Ruby compatibility message 2020-06-01 17:58:22 -04:00
Frank Dana
45b68cee68 Merge pull request #521 from ferdnyc/allow-ffmpeg32-fail
Travis: allow_failures for FFmpeg 3.2
2020-06-01 17:22:23 -04:00
FeRD (Frank Dana)
1dd0281deb Use Ubuntu 20.04 for FFmpeg 4 2020-06-01 17:08:40 -04:00
FeRD (Frank Dana)
456715437a Remove unused Qt PPAs 2020-06-01 17:07:20 -04:00
FeRD (Frank Dana)
58c971a576 Travis: allow_failures for FFmpeg 3.2 2020-06-01 15:41:45 -04:00
FeRD (Frank Dana)
2a04301482 Travis: allow_failures for FFmpeg 3.2 2020-06-01 15:37:24 -04:00
Jonathan Thomas
e4dd72669f Fix FPS setting on FFmpeg 4, which currently is not setting a valid FPS. 2020-06-01 13:24:07 -05:00
Jonathan Thomas
10ed4baae3 Merge pull request #496 from OpenShot/emojis
Transform Improvements (Keyframe origin point)
2020-05-25 17:41:55 -05:00
Jonathan Thomas
972c2905e6 Merge pull request #517 from ferdnyc/ruby-build-fix
Fix support for older CMake
2020-05-24 01:50:05 -05:00
Frank Dana
2e3181fe7f Merge pull request #513 from jeffski/set-constructor-clip
Set clip in constructor to resolve scale crop issue
2020-05-22 04:13:54 -04:00
FeRD (Frank Dana)
128bacce70 Support older CMake
add_compile_definitions() is CMake 3.12+ only.
2020-05-19 07:37:25 -04:00