RepoMirrors/tdesktop
1
0
Fork 0
mirror of https://github.com/telegramdesktop/tdesktop synced 2025-03-01 03:50:43 +00:00
Code Issues Projects Releases Wiki Activity

Enable ffmpeg dav1d support

Browse Source
This commit is contained in:
Ilya Fedin 2022-12-25 02:16:21 +04:00 committed by John Preston
parent 13eeddf479
commit 95b29f5f35
3 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Telegram/build/docker/centos_env/Dockerfile
View File

@ -56,7 +56,7 @@ ENV CXXFLAGS $CFLAGS
FROM builder AS patches FROM builder AS patches
RUN git clone {{ GIT }}/desktop-app/patches.git \ RUN git clone {{ GIT }}/desktop-app/patches.git \
&& cd patches \ && cd patches \
&& git checkout c1f8effd69 \ && git checkout b842feb5f8 \
&& rm -rf .git && rm -rf .git
FROM builder AS nasm 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 FROM builder AS ffmpeg
COPY --link --from=opus {{ LibrariesPath }}/opus-cache / COPY --link --from=opus {{ LibrariesPath }}/opus-cache /
COPY --link --from=dav1d {{ LibrariesPath }}/dav1d-cache /
COPY --link --from=libvpx {{ LibrariesPath }}/libvpx-cache / COPY --link --from=libvpx {{ LibrariesPath }}/libvpx-cache /
COPY --link --from=nv-codec-headers {{ LibrariesPath }}/nv-codec-headers-cache / COPY --link --from=nv-codec-headers {{ LibrariesPath }}/nv-codec-headers-cache /
@ -481,6 +482,7 @@ RUN git init ffmpeg \
--disable-network \ --disable-network \
--disable-autodetect \ --disable-autodetect \
--disable-everything \ --disable-everything \
--enable-libdav1d \
--enable-libopus \ --enable-libopus \
--enable-libvpx \ --enable-libvpx \
--enable-ffnvcodec \ --enable-ffnvcodec \
@ -506,6 +508,7 @@ RUN git init ffmpeg \
--enable-decoder=gif \ --enable-decoder=gif \
--enable-decoder=h264 \ --enable-decoder=h264 \
--enable-decoder=hevc \ --enable-decoder=hevc \
--enable-decoder=libdav1d \
--enable-decoder=libvpx_vp8 \ --enable-decoder=libvpx_vp8 \
--enable-decoder=libvpx_vp9 \ --enable-decoder=libvpx_vp9 \
--enable-decoder=mp1 \ --enable-decoder=mp1 \

2
Telegram/build/prepare/prepare.py
View File

@ -397,7 +397,7 @@ if customRunCommand:
stage('patches', """ stage('patches', """
git clone https://github.com/desktop-app/patches.git git clone https://github.com/desktop-app/patches.git
cd patches cd patches
git checkout 92f4ee3867 git checkout b842feb5f8
""") """)
stage('msys64', """ stage('msys64', """

2
cmake

@ -1 +1 @@
Subproject commit af37d955bb97e03a1dbfbc408defee98081afbd0 Subproject commit bb07e9d6980498fe7c2add7ab998d8f43afa8cdc