@@ -20,14 +20,6 @@ ENV FFMPEG_MT=$FFMPEG_MT
20
20
RUN apt-get update && \
21
21
apt-get install -y pkg-config autoconf automake libtool ragel
22
22
23
- # Build zimg
24
- FROM emsdk-base AS zimg-builder
25
- ENV ZIMG_BRANCH=release-3.0.5
26
- RUN apt-get update && apt-get install -y git
27
- RUN git clone --recursive -b $ZIMG_BRANCH https://github.com/sekrit-twc/zimg.git /src
28
- COPY build/zimg.sh /src/build.sh
29
- RUN bash -x /src/build.sh
30
-
31
23
# Build x264
32
24
FROM emsdk-base AS x264-builder
33
25
ENV X264_BRANCH=4-cores
@@ -132,6 +124,14 @@ ADD https://github.com/libass/libass.git#$LIBASS_BRANCH /src
132
124
COPY build/libass.sh /src/build.sh
133
125
RUN bash -x /src/build.sh
134
126
127
+ # Build zimg
128
+ FROM emsdk-base AS zimg-builder
129
+ ENV ZIMG_BRANCH=release-3.0.5
130
+ RUN apt-get update && apt-get install -y git
131
+ RUN git clone --recursive -b $ZIMG_BRANCH https://github.com/sekrit-twc/zimg.git /src
132
+ COPY build/zimg.sh /src/build.sh
133
+ RUN bash -x /src/build.sh
134
+
135
135
# Base ffmpeg image with dependencies and source code populated.
136
136
FROM emsdk-base AS ffmpeg-base
137
137
RUN embuilder build sdl2 sdl2-mt
@@ -147,7 +147,7 @@ COPY --from=libwebp-builder $INSTALL_DIR $INSTALL_DIR
147
147
COPY --from=libass-builder $INSTALL_DIR $INSTALL_DIR
148
148
COPY --from=zimg-builder $INSTALL_DIR $INSTALL_DIR
149
149
150
- # Build ffmpeg with --enable-libzimg
150
+ # Build ffmpeg
151
151
FROM ffmpeg-base AS ffmpeg-builder
152
152
COPY build/ffmpeg.sh /src/build.sh
153
153
RUN bash -x /src/build.sh \
0 commit comments