From 9f93dae6f9c0a2eaaf7fc9329d4146235aeaf6b5 Mon Sep 17 00:00:00 2001 From: John Preston Date: Wed, 26 May 2021 18:22:30 +0400 Subject: [PATCH] Update FFmpeg to 4.4. --- Telegram/build/docker/centos_env/Dockerfile | 2 +- docs/building-msvc-x64.md | 2 +- docs/building-msvc.md | 2 +- docs/building-xcode.md | 3 +-- 4 files changed, 4 insertions(+), 5 deletions(-) diff --git a/Telegram/build/docker/centos_env/Dockerfile b/Telegram/build/docker/centos_env/Dockerfile index f146af8fa..bc3de9d43 100644 --- a/Telegram/build/docker/centos_env/Dockerfile +++ b/Telegram/build/docker/centos_env/Dockerfile @@ -380,7 +380,7 @@ COPY --from=libXv ${LibrariesPath}/libXv-cache / COPY --from=libva ${LibrariesPath}/libva-cache / COPY --from=libvdpau ${LibrariesPath}/libvdpau-cache / -RUN git clone -b release/4.2 --depth=1 $GIT/FFmpeg/FFmpeg.git ffmpeg +RUN git clone -b release/4.4 --depth=1 $GIT/FFmpeg/FFmpeg.git ffmpeg WORKDIR ffmpeg RUN ./configure \ diff --git a/docs/building-msvc-x64.md b/docs/building-msvc-x64.md index 7b56d8409..b6e82f95d 100644 --- a/docs/building-msvc-x64.md +++ b/docs/building-msvc-x64.md @@ -163,7 +163,7 @@ Open **x64 Native Tools Command Prompt for VS 2019.bat**, go to ***BuildPath*** git clone https://github.com/FFmpeg/FFmpeg.git ffmpeg cd ffmpeg - git checkout release/4.2 + git checkout release/4.4 set CHERE_INVOKING=enabled_from_arguments set MSYS2_PATH_TYPE=inherit diff --git a/docs/building-msvc.md b/docs/building-msvc.md index 414822c7a..734b4c7ca 100644 --- a/docs/building-msvc.md +++ b/docs/building-msvc.md @@ -163,7 +163,7 @@ Open **x86 Native Tools Command Prompt for VS 2019.bat**, go to ***BuildPath*** git clone https://github.com/FFmpeg/FFmpeg.git ffmpeg cd ffmpeg - git checkout release/4.2 + git checkout release/4.4 set CHERE_INVOKING=enabled_from_arguments set MSYS2_PATH_TYPE=inherit diff --git a/docs/building-xcode.md b/docs/building-xcode.md index e5fee34d0..76431eb4a 100644 --- a/docs/building-xcode.md +++ b/docs/building-xcode.md @@ -133,7 +133,7 @@ Go to ***BuildPath*** and run git clone https://github.com/FFmpeg/FFmpeg.git ffmpeg cd ffmpeg - git checkout release/4.2 + git checkout release/4.4 CFLAGS=`freetype-config --cflags` LDFLAGS=`freetype-config --libs` PKG_CONFIG_PATH=$PKG_CONFIG_PATH:/usr/local/lib/pkgconfig:/usr/lib/pkgconfig:/usr/X11/lib/pkgconfig @@ -211,7 +211,6 @@ Go to ***BuildPath*** and run --enable-decoder=pcm_u32be \ --enable-decoder=pcm_u32le \ --enable-decoder=pcm_u8 \ - --enable-decoder=pcm_zork \ --enable-decoder=vorbis \ --enable-decoder=wavpack \ --enable-decoder=wmalossless \