From 4dc7fd8cd1224f7ba02788bacdce4a653e3de36e Mon Sep 17 00:00:00 2001 From: John Preston Date: Tue, 8 Oct 2024 12:32:01 +0400 Subject: [PATCH] Add AAC/H264 encoders, MP4 muxer. --- Telegram/build/docker/centos_env/Dockerfile | 4 ++++ Telegram/build/prepare/prepare.py | 6 +++++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/Telegram/build/docker/centos_env/Dockerfile b/Telegram/build/docker/centos_env/Dockerfile index 89ca76a96..7c0edd864 100644 --- a/Telegram/build/docker/centos_env/Dockerfile +++ b/Telegram/build/docker/centos_env/Dockerfile @@ -493,6 +493,7 @@ RUN git clone -b n6.1.1 --depth=1 {{ GIT }}/FFmpeg/FFmpeg.git \ --disable-autodetect \ --disable-everything \ --enable-libdav1d \ + --enable-libopenh264 \ --enable-libopus \ --enable-libvpx \ --enable-vaapi \ @@ -587,6 +588,8 @@ RUN git clone -b n6.1.1 --depth=1 {{ GIT }}/FFmpeg/FFmpeg.git \ --enable-decoder=wmav1 \ --enable-decoder=wmav2 \ --enable-decoder=wmavoice \ + --enable-encoder=aac \ + --enable-encoder=libopenh264 \ --enable-encoder=libopus \ --enable-filter=atempo \ --enable-parser=aac \ @@ -610,6 +613,7 @@ RUN git clone -b n6.1.1 --depth=1 {{ GIT }}/FFmpeg/FFmpeg.git \ --enable-demuxer=mp3 \ --enable-demuxer=ogg \ --enable-demuxer=wav \ + --enable-muxer=mp4 \ --enable-muxer=ogg \ --enable-muxer=opus \ && make -j$(nproc) \ diff --git a/Telegram/build/prepare/prepare.py b/Telegram/build/prepare/prepare.py index c5932cb8a..d9067f99f 100644 --- a/Telegram/build/prepare/prepare.py +++ b/Telegram/build/prepare/prepare.py @@ -1217,13 +1217,14 @@ depends:yasm/yasm --arch="$arch" \ --extra-cflags="$MIN_VER -arch $arch $UNGUARDED -DCONFIG_SAFE_BITSTREAM_READER=1 -I$USED_PREFIX/include" \ --extra-cxxflags="$MIN_VER -arch $arch $UNGUARDED -DCONFIG_SAFE_BITSTREAM_READER=1 -I$USED_PREFIX/include" \ - --extra-ldflags="$MIN_VER -arch $arch $USED_PREFIX/lib/libopus.a" \ + --extra-ldflags="$MIN_VER -arch $arch $USED_PREFIX/lib/libopus.a -lc++" \ --disable-programs \ --disable-doc \ --disable-network \ --disable-everything \ --enable-protocol=file \ --enable-libdav1d \ + --enable-libopenh264 \ --enable-libopus \ --enable-libvpx \ --enable-hwaccel=h264_videotoolbox \ @@ -1301,7 +1302,9 @@ depends:yasm/yasm --enable-decoder=wmav1 \ --enable-decoder=wmav2 \ --enable-decoder=wmavoice \ + --enable-encoder=aac \ --enable-encoder=libopus \ + --enable-encoder=libopenh264 \ --enable-filter=atempo \ --enable-parser=aac \ --enable-parser=aac_latm \ @@ -1324,6 +1327,7 @@ depends:yasm/yasm --enable-demuxer=mp3 \ --enable-demuxer=ogg \ --enable-demuxer=wav \ + --enable-muxer=mp4 \ --enable-muxer=ogg \ --enable-muxer=opus }