razzaline/tahoma2d
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases 1 Wiki Activity

Update ffmpeg to v5.0

Browse source
This commit is contained in:
manongjohn 2022-01-29 19:00:54 -05:00
parent 0f36cd1b8f
commit 7d7ddd1311
6 changed files with 13 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
ci-scripts/linux/tahoma-buildffmpeg.sh
View file

@ -16,7 +16,7 @@ sudo make install
cd ..
echo ">>> Cloning ffmpeg"
git clone https://github.com/tahoma2d/ffmpeg ffmpeg
git clone -b v4.3.1 https://github.com/tahoma2d/FFmpeg ffmpeg
cd ffmpeg
echo "*" >| .gitignore

6
ci-scripts/linux/tahoma-get3rdpartyapps.sh
View file

@ -13,9 +13,9 @@ if [ -d ffmpeg ]
then
rm -rf ffmpeg
fi
wget https://github.com/tahoma2d/FFmpeg/releases/download/v4.3.1/ffmpeg-4.3.1-linux-static-lgpl.zip
unzip ffmpeg-4.3.1-linux-static-lgpl.zip
mv ffmpeg-4.3.1-linux-static-lgpl ffmpeg
wget https://github.com/tahoma2d/FFmpeg/releases/download/v5.0.0/ffmpeg-5.0.0-linux64-static-lgpl.zip
unzip ffmpeg-5.0.0-linux64-static-lgpl.zip
mv ffmpeg-5.0.0-linux64-static-lgpl ffmpeg
echo ">>> Getting Rhubarb Lip Sync"

2
ci-scripts/osx/tahoma-buildffmpeg.sh
View file

@ -26,7 +26,7 @@ sudo make install
cd ../..
echo ">>> Cloning ffmpeg"
git clone https://github.com/tahoma2d/ffmpeg
git clone -b v4.3.1 https://github.com/tahoma2d/FFmpeg ffmpeg
cd ffmpeg
echo "*" >| .gitignore

6
ci-scripts/osx/tahoma-get3rdpartyapps.sh
View file

@ -13,9 +13,9 @@ if [ -d ffmpeg ]
then
rm -rf ffmpeg
fi
wget https://github.com/tahoma2d/FFmpeg/releases/download/v4.3.1/ffmpeg-4.3.1-macos64-static-lgpl.zip
unzip ffmpeg-4.3.1-macos64-static-lgpl.zip
mv ffmpeg-4.3.1-macos64-static-lgpl ffmpeg
wget https://github.com/tahoma2d/FFmpeg/releases/download/v5.0.0/ffmpeg-5.0.0-macos64-static-lgpl.zip
unzip ffmpeg-5.0.0-macos64-static-lgpl.zip
mv ffmpeg-5.0.0-macos64-static-lgpl ffmpeg
echo ">>> Getting Rhubarb Lip Sync"

6
ci-scripts/windows/tahoma-get3rdpartyapps.bat
View file

@ -19,9 +19,9 @@ move crashrpt\CrashRpt1500.lib ..\crashrpt
echo ">>> Getting FFmpeg"
IF EXIST ffmpeg rmdir /S /Q ffmpeg
curl -fsSL -o ffmpeg-4.3.1-win64-static-lgpl.zip https://github.com/tahoma2d/FFmpeg/releases/download/v4.3.1/ffmpeg-4.3.1-win64-static-lgpl.zip
7z x ffmpeg-4.3.1-win64-static-lgpl.zip
rename ffmpeg-4.3.1-win64-static-lgpl ffmpeg
curl -fsSL -o ffmpeg-5.0.0-win64-static-lgpl.zip https://github.com/tahoma2d/FFmpeg/releases/download/v5.0.0/ffmpeg-5.0.0-win64-static-lgpl.zip
7z x ffmpeg-5.0.0-win64-static-lgpl.zip
rename ffmpeg-5.0.0-win64-static-lgpl ffmpeg
echo ">>> Getting Rhubarb Lip Sync"

4
stuff/doc/LICENSE/LICENSE_ffmpeg_info.txt
View file

@ -1,10 +1,10 @@
Tahoma2D ships with FFmpeg, and uses FFmpeg through command line commands.
Tahoma2D does not directly use FFmpeg libraries or code.
As of July 2020, Tahoma2D is shipping with FFmpeg 4.3 LGPL version from https://ffmpeg.zeranoe.com/builds/
As of January 2022, Windows and Linux versions of Tahoma2D are shipped with FFmpeg 5.0 LGPL version from https://github.com/BtbN/FFmpeg-Builds.
MacOS versions of Tahoma2D are shipped with FFmpeg 5.0 LGL compiled from source at https://github.com/FFmpeg/FFmpeg.
FFmpeg source code can be found at:
https://github.com/tahoma2d/FFmpeg
or
https://github.com/FFmpeg/FFmpeg