Skip to content

Commit 9c07783

Browse files
author
Andrea Medeghini
committed
Checkout specific version of ffmpeg
1 parent 884985a commit 9c07783

5 files changed

Lines changed: 24 additions & 6 deletions

File tree

Dockerfile.linux

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,6 @@ RUN git clone https://github.com/nextbreakpoint/FFmpeg.git ffmpeg
77
COPY Makefile.lib.linux ffmpeg/Makefile.lib.linux
88
COPY Makefile.jni.linux ffmpeg/Makefile.jni.linux
99

10-
COPY Patch.linux ffmpeg/Patch.linux
11-
RUN patch -p0 < ffmpeg/Patch.linux
12-
1310
COPY build-linux.sh build-linux.sh
1411

1512
RUN chmod 700 build-linux.sh

Dockerfile.mingw64

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,6 @@ RUN git clone https://github.com/nextbreakpoint/FFmpeg.git ffmpeg
77
COPY Makefile.lib.mingw64 ffmpeg/Makefile.lib.mingw64
88
COPY Makefile.jni.mingw64 ffmpeg/Makefile.jni.mingw64
99

10-
COPY Patch.mingw64 ffmpeg/Patch.mingw64
11-
RUN patch -p0 < ffmpeg/Patch.mingw64
12-
1310
COPY build-mingw64.sh build-mingw64.sh
1411

1512
RUN chmod 700 build-mingw64.sh

build-linux.sh

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,15 @@ export BUILD_DIR=`pwd`/build
33

44
cd ffmpeg
55

6+
git checkout ce36e74e75751c721185fbebaa4ee8714b44c5a5
7+
8+
cd ..
9+
10+
Patch.linux ffmpeg/Patch.linux
11+
patch -p0 < ffmpeg/Patch.linux
12+
13+
cd ffmpeg
14+
615
make -f Makefile.lib.linux ffmpeg
716

817
make -f Makefile.jni.linux all

build-macos.sh

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,12 @@ 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+
cd ffmpeg
12+
13+
git checkout ce36e74e75751c721185fbebaa4ee8714b44c5a5
14+
15+
cd ..
16+
1117
cp Patch.macos ffmpeg/Patch.macos
1218
patch -p0 < ffmpeg/Patch.macos
1319

build-mingw64.sh

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,15 @@ export BUILD_DIR=`pwd`/build
33

44
cd ffmpeg
55

6+
git checkout ce36e74e75751c721185fbebaa4ee8714b44c5a5
7+
8+
cd ..
9+
10+
Patch.mingw64 ffmpeg/Patch.mingw64
11+
patch -p0 < ffmpeg/Patch.mingw64
12+
13+
cd ffmpeg
14+
615
make -f Makefile.lib.mingw64 ffmpeg
716

817
make -f Makefile.jni.mingw64 all

0 commit comments

Comments
 (0)