Skip to content

Commit 91f3316

Browse files
Merge pull request #4 from nextbreakpoint/wip
Wip
2 parents 0b6b070 + 437c36b commit 91f3316

File tree

380 files changed

+315791
-14896
lines changed

Some content is hidden

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

380 files changed

+315791
-14896
lines changed

.gitignore

Lines changed: 24 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,26 @@
1-
build
21
*.iml
32
.idea
4-
ffmpeg
3+
/ffmpeg4java-macos-test/test-frame-10.png
4+
/ffmpeg4java-macos-test/test-frame-20.png
5+
/ffmpeg4java-macos-test/test-frame-30.png
6+
/ffmpeg4java-macos-test/test-frame-40.png
7+
/ffmpeg4java-macos-test/test-video-48.mpg
8+
/ffmpeg4java-linux-test/test-frame-10.png
9+
/ffmpeg4java-linux-test/test-frame-20.png
10+
/ffmpeg4java-linux-test/test-frame-30.png
11+
/ffmpeg4java-linux-test/test-frame-40.png
12+
/ffmpeg4java-linux-test/test-video-48.mpg
13+
/ffmpeg4java-windows-test/test-frame-10.png
14+
/ffmpeg4java-windows-test/test-frame-20.png
15+
/ffmpeg4java-windows-test/test-frame-30.png
16+
/ffmpeg4java-windows-test/test-frame-40.png
17+
/ffmpeg4java-windows-test/test-video-48.mpg
18+
/ffmpeg4java-macos/native/ffmpeg/
19+
/ffmpeg4java-linux/native/ffmpeg/
20+
/ffmpeg4java-windows/native/ffmpeg/
21+
/ffmpeg4java-windows/src/main/resources/ffmpeg4java.dll
22+
/ffmpeg4java-linux/src/main/resources/libffmpeg4java.so
23+
/ffmpeg4java-macos/src/main/resources/libffmpeg4java.dylib
24+
/ffmpeg4java-macos-examples/output.mp4
25+
/ffmpeg4java-linux-examples/output.mp4
26+
/ffmpeg4java-windows-examples/output.mp4

Dockerfile.base

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

Dockerfile.java

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

Dockerfile.linux

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

Dockerfile.mingw64

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

Dockerfile.repo

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

Makefile

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
1+
.PHONY: clean
2+
clean:
3+
mvn clean
4+
5+
.PHONY: compile
6+
compile:
7+
mvn compile
8+
9+
.PHONY: package
10+
package:
11+
mvn package -DskipTests=true
12+
13+
.PHONY: install
14+
install:
15+
mvn install -DskipTests=true
16+
17+
.PHONY: extract
18+
extract:
19+
test $(system)
20+
@echo System = $(system)
21+
cd ffmpeg4java-$(system) && ./extract.sh
22+
23+
.PHONY: dump
24+
dump:
25+
test $(system)
26+
@echo System = $(system)
27+
cd ffmpeg4java-$(system) && ./dump.sh
28+
29+
.PHONY: verify
30+
verify:
31+
test $(system)
32+
@echo System = $(system)
33+
#MAVEN_OPTS="--enable-preview --enable-native-access=ALL-UNNAMED -Djava.library.path=ffmpeg4java-$(system)-test/target/lib -Djextract.trace.downcalls=false -Xlog:library" mvn verify -P$(system)
34+
MAVEN_OPTS="--enable-preview --enable-native-access=ALL-UNNAMED -Djava.library.path=ffmpeg4java-$(system)-test/target/lib -Djextract.trace.downcalls=false $(properties)" mvn verify -P$(system)
35+
36+
.PHONY: copy-legal
37+
copy-legal:
38+
cp legal/*.txt ffmpeg4java-macos/src/main/resources/META-INF/
39+
cp legal/*.txt ffmpeg4java-linux/src/main/resources/META-INF/
40+
cp legal/*.txt ffmpeg4java-windows/src/main/resources/META-INF/

Makefile.java

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

Makefile.jni.linux

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

Makefile.jni.macos

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

0 commit comments

Comments
 (0)