Skip to content

Commit

Permalink
Merge pull request #4365 from remotion-dev/ffmpeg-videotoolbox
Browse files Browse the repository at this point in the history
  • Loading branch information
JonnyBurger authored Oct 4, 2024
2 parents 85cdc7c + 855355c commit fe89559
Show file tree
Hide file tree
Showing 27 changed files with 3 additions and 3 deletions.
Binary file modified packages/compositor-darwin-arm64/ffmpeg
Binary file not shown.
Binary file modified packages/compositor-darwin-arm64/ffprobe
Binary file not shown.
Binary file modified packages/compositor-darwin-arm64/libavcodec.dylib
Binary file not shown.
Binary file modified packages/compositor-darwin-arm64/libavdevice.dylib
Binary file not shown.
Binary file modified packages/compositor-darwin-arm64/libavfilter.dylib
Binary file not shown.
Binary file modified packages/compositor-darwin-arm64/libavformat.dylib
Binary file not shown.
Binary file modified packages/compositor-darwin-arm64/libavutil.dylib
Binary file not shown.
Binary file modified packages/compositor-darwin-arm64/libswresample.dylib
Binary file not shown.
Binary file modified packages/compositor-darwin-arm64/libswscale.dylib
Binary file not shown.
Binary file modified packages/compositor-darwin-arm64/remotion
Binary file not shown.
Binary file modified packages/compositor-darwin-x64/ffmpeg
Binary file not shown.
Binary file modified packages/compositor-darwin-x64/ffprobe
Binary file not shown.
Binary file modified packages/compositor-darwin-x64/libavcodec.dylib
Binary file not shown.
Binary file modified packages/compositor-darwin-x64/libavdevice.dylib
Binary file not shown.
Binary file modified packages/compositor-darwin-x64/libavfilter.dylib
Binary file not shown.
Binary file modified packages/compositor-darwin-x64/libavformat.dylib
Binary file not shown.
Binary file modified packages/compositor-darwin-x64/libavutil.dylib
Binary file not shown.
Binary file modified packages/compositor-darwin-x64/libswresample.dylib
Binary file not shown.
Binary file modified packages/compositor-darwin-x64/libswscale.dylib
Binary file not shown.
Binary file modified packages/compositor-darwin-x64/remotion
Binary file not shown.
Binary file modified packages/compositor-linux-arm64-gnu/remotion
Binary file not shown.
Binary file modified packages/compositor-linux-arm64-musl/remotion
Binary file not shown.
Binary file modified packages/compositor-linux-x64-gnu/remotion
Binary file not shown.
Binary file modified packages/compositor-linux-x64-musl/remotion
Binary file not shown.
Binary file modified packages/compositor-win32-x64-msvc/remotion.exe
Binary file not shown.
4 changes: 2 additions & 2 deletions packages/renderer/Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion packages/renderer/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ image = "0.24.7"
arboard = "3.2.0"
sysinfo = "0.30.7"
mp4 = {git = "https://github.com/jonnyburger/mp4-rust", rev = "92ba375738cc2f05a4d754e1f968cf2e97d06641"}
ffmpeg-next = {git = "https://github.com/remotion-dev/rust-ffmpeg", rev ="7390be48beef9dc1e9433532abcac4d431ccc362"}
ffmpeg-next = {git = "https://github.com/remotion-dev/rust-ffmpeg", rev ="b3878a087fc5be3985974cec9627072bc94b8f52"}

[[bin]]
name = "remotion"
Expand Down

0 comments on commit fe89559

Please sign in to comment.