From 8aa2f56717406e0aa9ad8cbc8ec4db98d7faa9de Mon Sep 17 00:00:00 2001 From: John Preston Date: Wed, 22 Dec 2021 10:55:29 +0000 Subject: [PATCH] Specify exact FFmpeg revision. --- Telegram/build/docker/centos_env/Dockerfile | 8 ++++++-- Telegram/build/prepare/prepare.py | 2 +- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/Telegram/build/docker/centos_env/Dockerfile b/Telegram/build/docker/centos_env/Dockerfile index 76a163b26..0ccf715e9 100644 --- a/Telegram/build/docker/centos_env/Dockerfile +++ b/Telegram/build/docker/centos_env/Dockerfile @@ -457,9 +457,13 @@ COPY --from=drm ${LibrariesPath}/drm-cache / COPY --from=libva ${LibrariesPath}/libva-cache / COPY --from=libvdpau ${LibrariesPath}/libvdpau-cache / -RUN git clone -b release/4.4 --depth=1 $GIT/FFmpeg/FFmpeg.git ffmpeg - +RUN mkdir ffmpeg WORKDIR ffmpeg +RUN git init +RUN git remote add origin $GIT/FFmpeg/FFmpeg.git +RUN git fetch --depth=1 origin cc33e73618a981de7fd96385ecb34719de031f16 +RUN git reset --hard FETCH_HEAD + RUN ./configure \ --extra-cflags="-DCONFIG_SAFE_BITSTREAM_READER=1 $HFLAGS" \ --extra-cxxflags="-DCONFIG_SAFE_BITSTREAM_READER=1 $HFLAGS" \ diff --git a/Telegram/build/prepare/prepare.py b/Telegram/build/prepare/prepare.py index c37f50152..343d64ab1 100644 --- a/Telegram/build/prepare/prepare.py +++ b/Telegram/build/prepare/prepare.py @@ -625,7 +625,7 @@ mac: stage('ffmpeg', """ git clone https://github.com/FFmpeg/FFmpeg.git ffmpeg cd ffmpeg - git checkout release/4.4 + git checkout cc33e73618 win: SET PATH_BACKUP_=%PATH% SET PATH=%ROOT_DIR%\\ThirdParty\\msys64\\usr\\bin;%PATH%