Skip to content

Commit 4817b0d

Browse files
author
Andrea Medeghini
committed
Fixed regression
1 parent a6c3a67 commit 4817b0d

File tree

4 files changed

+6
-2
lines changed

4 files changed

+6
-2
lines changed

Dockerfile.linux

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@ RUN apt-get update && apt-get -y install make gcc g++
55
COPY Makefile.lib.linux ffmpeg/Makefile.lib.linux
66
COPY Makefile.jni.linux ffmpeg/Makefile.jni.linux
77

8+
COPY Patch.linux ffmpeg/Patch.linux
9+
810
COPY build-linux.sh build-linux.sh
911

1012
RUN chmod 700 build-linux.sh

Dockerfile.mingw64

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@ RUN apt-get update && apt-get -y install make mingw-w64
55
COPY Makefile.lib.mingw64 ffmpeg/Makefile.lib.mingw64
66
COPY Makefile.jni.mingw64 ffmpeg/Makefile.jni.mingw64
77

8+
COPY Patch.mingw64 ffmpeg/Patch.mingw64
9+
810
COPY build-mingw64.sh build-mingw64.sh
911

1012
RUN chmod 700 build-mingw64.sh

build-macos.sh

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,14 @@ git clone https://github.com/nextbreakpoint/FFmpeg.git ffmpeg
88
cp Makefile.lib.macos ffmpeg/Makefile.lib.macos
99
cp Makefile.jni.macos ffmpeg/Makefile.jni.macos
1010

11+
cp Patch.macos ffmpeg/Patch.macos
12+
1113
cd ffmpeg
1214

1315
git checkout ce36e74e75751c721185fbebaa4ee8714b44c5a5
1416

1517
cd ..
1618

17-
cp Patch.macos ffmpeg/Patch.macos
1819
patch -p0 < ffmpeg/Patch.macos
1920

2021
cd ffmpeg

build-mingw64.sh

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ git checkout ce36e74e75751c721185fbebaa4ee8714b44c5a5
77

88
cd ..
99

10-
Patch.mingw64 ffmpeg/Patch.mingw64
1110
patch -p0 < ffmpeg/Patch.mingw64
1211

1312
cd ffmpeg

0 commit comments

Comments
 (0)