Skip to content

Commit

Permalink
Merge pull request #4354 from remotion-dev/ffmpeg-7-1
Browse files Browse the repository at this point in the history
  • Loading branch information
JonnyBurger authored Oct 3, 2024
2 parents 311154d + f3ecdaf commit 277bb2c
Show file tree
Hide file tree
Showing 84 changed files with 59 additions and 65 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/ffmpeg
Binary file not shown.
Binary file modified packages/compositor-linux-arm64-gnu/ffprobe
Binary file not shown.
Binary file modified packages/compositor-linux-arm64-gnu/libavcodec.so
Binary file not shown.
Binary file modified packages/compositor-linux-arm64-gnu/libavdevice.so
Binary file not shown.
Binary file modified packages/compositor-linux-arm64-gnu/libavfilter.so
Binary file not shown.
Binary file modified packages/compositor-linux-arm64-gnu/libavformat.so
Binary file not shown.
Binary file modified packages/compositor-linux-arm64-gnu/libavutil.so
Binary file not shown.
Binary file modified packages/compositor-linux-arm64-gnu/libswresample.so
Binary file not shown.
Binary file modified packages/compositor-linux-arm64-gnu/libswscale.so
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/ffmpeg
Binary file not shown.
Binary file modified packages/compositor-linux-arm64-musl/ffprobe
Binary file not shown.
Binary file modified packages/compositor-linux-arm64-musl/libavcodec.so
Binary file not shown.
Binary file modified packages/compositor-linux-arm64-musl/libavdevice.so
Binary file not shown.
Binary file modified packages/compositor-linux-arm64-musl/libavfilter.so
Binary file not shown.
Binary file modified packages/compositor-linux-arm64-musl/libavformat.so
Binary file not shown.
Binary file modified packages/compositor-linux-arm64-musl/libavutil.so
Binary file not shown.
Binary file modified packages/compositor-linux-arm64-musl/libswresample.so
Binary file not shown.
Binary file modified packages/compositor-linux-arm64-musl/libswscale.so
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/ffmpeg
Binary file not shown.
Binary file modified packages/compositor-linux-x64-gnu/ffprobe
Binary file not shown.
Binary file modified packages/compositor-linux-x64-gnu/libavcodec.so
Binary file not shown.
Binary file modified packages/compositor-linux-x64-gnu/libavdevice.so
Binary file not shown.
Binary file modified packages/compositor-linux-x64-gnu/libavfilter.so
Binary file not shown.
Binary file modified packages/compositor-linux-x64-gnu/libavformat.so
Binary file not shown.
Binary file modified packages/compositor-linux-x64-gnu/libavutil.so
Binary file not shown.
Binary file modified packages/compositor-linux-x64-gnu/libswresample.so
Binary file not shown.
Binary file modified packages/compositor-linux-x64-gnu/libswscale.so
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/ffmpeg
Binary file not shown.
Binary file modified packages/compositor-linux-x64-musl/ffprobe
Binary file not shown.
Binary file modified packages/compositor-linux-x64-musl/libavcodec.so
Binary file not shown.
Binary file modified packages/compositor-linux-x64-musl/libavdevice.so
Binary file not shown.
Binary file modified packages/compositor-linux-x64-musl/libavfilter.so
Binary file not shown.
Binary file modified packages/compositor-linux-x64-musl/libavformat.so
Binary file not shown.
Binary file modified packages/compositor-linux-x64-musl/libavutil.so
Binary file not shown.
Binary file modified packages/compositor-linux-x64-musl/libswresample.so
Binary file not shown.
Binary file modified packages/compositor-linux-x64-musl/libswscale.so
Binary file not shown.
Binary file modified packages/compositor-linux-x64-musl/remotion
Binary file not shown.
Binary file added packages/compositor-win32-x64-msvc/avcodec-61.dll
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file added packages/compositor-win32-x64-msvc/avutil-59.dll
Binary file not shown.
Binary file modified packages/compositor-win32-x64-msvc/ffmpeg.exe
Binary file not shown.
Binary file modified packages/compositor-win32-x64-msvc/ffprobe.exe
Binary file not shown.
Binary file modified packages/compositor-win32-x64-msvc/remotion.exe
Binary file not shown.
Binary file not shown.
Binary file added packages/compositor-win32-x64-msvc/swscale-8.dll
Binary file not shown.
2 changes: 1 addition & 1 deletion packages/docs/docs/contributing/rust.mdx
2 changes: 1 addition & 1 deletion packages/example/testcloudrun.sh
4 changes: 2 additions & 2 deletions packages/it-tests/src/rendering/render-scale.test.ts
2 changes: 1 addition & 1 deletion packages/it-tests/src/rendering/rendering.test.ts
Binary file modified packages/lambda/src/test/integration/renders/regular-audio.bmp
Binary file not shown.
Binary file modified packages/lambda/src/test/integration/renders/seamless-audio.bmp
Binary file not shown.
Binary file not shown.
94 changes: 42 additions & 52 deletions packages/renderer/Cargo.lock
2 changes: 1 addition & 1 deletion packages/renderer/Cargo.toml
3 changes: 2 additions & 1 deletion packages/renderer/build.mjs → packages/renderer/build.ts
6 changes: 3 additions & 3 deletions packages/renderer/package.json
3 changes: 3 additions & 0 deletions packages/renderer/rust/ffmpeg.rs
4 changes: 2 additions & 2 deletions packages/renderer/src/test/get-silent-parts.test.ts
2 changes: 1 addition & 1 deletion set-version.ts

0 comments on commit 277bb2c

Please sign in to comment.