Skip to content

Commit 7ba5596

Browse files
Fix ffmpeg build (#15499)
ffmpeg needs a more recent meson. Meson now works with OSS-Fuzz again.
1 parent ac3b0ba commit 7ba5596

1 file changed

Lines changed: 1 addition & 2 deletions

File tree

projects/ffmpeg/Dockerfile

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,7 @@ RUN curl -LO https://mirrors.kernel.org/ubuntu/pool/main/a/automake-1.16/automak
2020
apt install ./automake_1.16.5-1.3_all.deb
2121
RUN curl -LO https://mirrors.kernel.org/ubuntu/pool/main/a/autoconf/autoconf_2.72-3.1ubuntu1_all.deb && \
2222
apt install ./autoconf_2.72-3.1ubuntu1_all.deb
23-
# Meson is pinned to get around https://github.com/mesonbuild/meson/issues/14533
24-
RUN python3 -m pip install --upgrade pip && python3 -m pip install -U meson==1.7.2 ninja
23+
RUN python3 -m pip install --upgrade pip && python3 -m pip install -U meson==1.11.1 ninja
2524

2625
RUN git clone --depth 1 https://github.com/FFmpeg/FFmpeg ffmpeg
2726

0 commit comments

Comments
 (0)