@@ -20,14 +20,6 @@ ENV FFMPEG_MT=$FFMPEG_MT
2020RUN apt-get update && \
2121 apt-get install -y pkg-config autoconf automake libtool ragel
2222
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-
3123# Build x264
3224FROM emsdk-base AS x264-builder
3325ENV X264_BRANCH=4-cores
@@ -132,6 +124,14 @@ ADD https://github.com/libass/libass.git#$LIBASS_BRANCH /src
132124COPY build/libass.sh /src/build.sh
133125RUN bash -x /src/build.sh
134126
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+
135135# Base ffmpeg image with dependencies and source code populated.
136136FROM emsdk-base AS ffmpeg-base
137137RUN embuilder build sdl2 sdl2-mt
@@ -147,7 +147,7 @@ COPY --from=libwebp-builder $INSTALL_DIR $INSTALL_DIR
147147COPY --from=libass-builder $INSTALL_DIR $INSTALL_DIR
148148COPY --from=zimg-builder $INSTALL_DIR $INSTALL_DIR
149149
150- # Build ffmpeg with --enable-libzimg
150+ # Build ffmpeg
151151FROM ffmpeg-base AS ffmpeg-builder
152152COPY build/ffmpeg.sh /src/build.sh
153153RUN bash -x /src/build.sh \
0 commit comments