Skip to content

Commit b03ef85

Browse files
authored
Merge pull request #33 from helmerapp/feat/ffmpeg-bundle
feat/ffmpeg-bundle
2 parents d7177e6 + 2f69cb4 commit b03ef85

File tree

334 files changed

+71680
-12
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

334 files changed

+71680
-12
lines changed

.cargo/config.example.toml

Lines changed: 0 additions & 9 deletions
This file was deleted.

.cargo/config.toml

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
[env]
2+
3+
# FFMPEG Libraries
4+
FFMPEG_STATIC = "1"
5+
6+
# Apple Silicon
7+
FFMPEG_INCLUDE_DIR_AARCH64_APPLE_DARWIN = { value = "bin/ffmpeg-6.1/aarch64-apple-darwin/include/", relative = true}
8+
FFMPEG_LIB_DIR_AARCH64_APPLE_DARWIN = { value = "bin/ffmpeg-6.1/aarch64-apple-darwin/lib/", relative = true}
9+
10+
# Windows x86_64, MSVC
11+
FFMPEG_INCLUDE_DIR_X86_64_PC_WINDOWS_MSVC = { value = "bin/ffmpeg-6.1/x86_64-pc-windows-msvc/include/", relative = true}
12+
FFMPEG_LIB_DIR_X86_64_PC_WINDOWS_MSVC = { value = "bin/ffmpeg-6.1/x86_64-pc-windows-msvc/lib/", relative = true}

.gitattributes

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
bin/** linguist-generated=true

.gitignore

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,4 @@ dist-ssr
2121
*.ntvs*
2222
*.njsproj
2323
*.sln
24-
*.sw?
25-
ext
26-
.cargo/config.toml
24+
*.sw?

bin/ffmpeg-6.1/aarch64-apple-darwin/include/libavcodec/ac3_parser.h

Lines changed: 36 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

bin/ffmpeg-6.1/aarch64-apple-darwin/include/libavcodec/adts_parser.h

Lines changed: 37 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)