diff options
author | 2020-03-12 12:52:36 -0700 | |
---|---|---|
committer | 2020-03-12 12:52:36 -0700 | |
commit | 4f87db0e1550f7ebe0faba9f56965c21dc646745 (patch) | |
tree | 263a92e25322c20ffa81ed6b69b04ade5c1b6cfd | |
parent | b0cd13e3bbe4ff91cf9e5de012898c055e70bac9 (diff) |
[libavif] Switch to nasm 2.14 as dav1d 0.6.0 requires it (#3498)
Fixes oss-fuzz issue #21188
Co-authored-by: Joe Drago <jdrago@netflix.com>
-rw-r--r-- | projects/libavif/Dockerfile | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/projects/libavif/Dockerfile b/projects/libavif/Dockerfile index a5e48a95..90421aab 100644 --- a/projects/libavif/Dockerfile +++ b/projects/libavif/Dockerfile @@ -21,9 +21,14 @@ ADD bionic.list /etc/apt/sources.list.d/bionic.list ADD nasm_apt.pin /etc/apt/preferences RUN apt-get update && \ - apt-get install --no-install-recommends -y curl python3-pip python3-setuptools python3-wheel cmake nasm git && \ + apt-get install --no-install-recommends -y curl python3-pip python3-setuptools python3-wheel cmake git && \ pip3 install meson ninja RUN git clone --depth 1 https://github.com/AOMediaCodec/libavif.git libavif WORKDIR libavif + +RUN curl -L https://download.videolan.org/contrib/nasm/nasm-2.14.tar.gz | tar xvz +RUN cd nasm-2.14 && ./configure && make -j2 && ln -s `pwd`/nasm /usr/bin/nasm && cd .. +RUN nasm --version + COPY build.sh avif_decode_fuzzer.cc avif_decode_seed_corpus.zip $SRC/ |