From 95b29f5f353c16e090f0e1ae7f43155ef9a0af69 Mon Sep 17 00:00:00 2001 From: Ilya Fedin Date: Sun, 25 Dec 2022 02:16:21 +0400 Subject: [PATCH] Enable ffmpeg dav1d support --- Telegram/build/docker/centos_env/Dockerfile | 5 ++++- Telegram/build/prepare/prepare.py | 2 +- cmake | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/Telegram/build/docker/centos_env/Dockerfile b/Telegram/build/docker/centos_env/Dockerfile index c188c7cf9..64f8beae4 100644 --- a/Telegram/build/docker/centos_env/Dockerfile +++ b/Telegram/build/docker/centos_env/Dockerfile @@ -56,7 +56,7 @@ ENV CXXFLAGS $CFLAGS FROM builder AS patches RUN git clone {{ GIT }}/desktop-app/patches.git \ && cd patches \ - && git checkout c1f8effd69 \ + && git checkout b842feb5f8 \ && rm -rf .git FROM builder AS nasm @@ -462,6 +462,7 @@ RUN git clone -b n11.1.5.1 --depth=1 {{ GIT }}/FFmpeg/nv-codec-headers.git \ FROM builder AS ffmpeg COPY --link --from=opus {{ LibrariesPath }}/opus-cache / +COPY --link --from=dav1d {{ LibrariesPath }}/dav1d-cache / COPY --link --from=libvpx {{ LibrariesPath }}/libvpx-cache / COPY --link --from=nv-codec-headers {{ LibrariesPath }}/nv-codec-headers-cache / @@ -481,6 +482,7 @@ RUN git init ffmpeg \ --disable-network \ --disable-autodetect \ --disable-everything \ + --enable-libdav1d \ --enable-libopus \ --enable-libvpx \ --enable-ffnvcodec \ @@ -506,6 +508,7 @@ RUN git init ffmpeg \ --enable-decoder=gif \ --enable-decoder=h264 \ --enable-decoder=hevc \ + --enable-decoder=libdav1d \ --enable-decoder=libvpx_vp8 \ --enable-decoder=libvpx_vp9 \ --enable-decoder=mp1 \ diff --git a/Telegram/build/prepare/prepare.py b/Telegram/build/prepare/prepare.py index 50baf8eca..fb1978ae5 100644 --- a/Telegram/build/prepare/prepare.py +++ b/Telegram/build/prepare/prepare.py @@ -397,7 +397,7 @@ if customRunCommand: stage('patches', """ git clone https://github.com/desktop-app/patches.git cd patches - git checkout 92f4ee3867 + git checkout b842feb5f8 """) stage('msys64', """ diff --git a/cmake b/cmake index af37d955b..bb07e9d69 160000 --- a/cmake +++ b/cmake @@ -1 +1 @@ -Subproject commit af37d955bb97e03a1dbfbc408defee98081afbd0 +Subproject commit bb07e9d6980498fe7c2add7ab998d8f43afa8cdc