Skip to content

Commit 77ff851

Browse files
committed
Add specify FFmpeg version function
1 parent 696db04 commit 77ff851

8 files changed

+191
-22
lines changed

extra/FFmpeg_versions.txt

+66
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,66 @@
1+
2023/10/21
2+
================================================================================
3+
ffmpeg version n4.4.4-ffmpeg-windows-build-helpers Copyright (c) 2000-2023 the FFmpeg developers
4+
built with gcc 10.2.0 (GCC)
5+
configuration: --pkg-config=pkg-config --pkg-config-flags=--static --extra-version=ffmpeg-windows-build-helpers --enable-version3 --disable-debug --disable-w32threads --arch=x86_64 --target-os=mingw32 --cross-prefix=/home/user/ffmpeg-windows-build-helpers/sandbox/cross_compilers/mingw-w64-x86_64/bin/x86_64-w64-mingw32- --enable-libcaca --enable-gray --enable-fontconfig --enable-gmp --enable-libass --enable-libbluray --enable-libbs2b --enable-libflite --enable-libfreetype --enable-libfribidi --enable-libgme --enable-libgsm --enable-libilbc --enable-libmodplug --enable-libmp3lame --enable-libopencore-amrnb --enable-libopencore-amrwb --enable-libopus --enable-libsnappy --enable-libsoxr --enable-libspeex --enable-libtheora --enable-libtwolame --enable-libvo-amrwbenc --enable-libvorbis --enable-libwebp --enable-libzimg --enable-libzvbi --enable-libmysofa --enable-libopenjpeg --enable-libopenh264 --enable-libvmaf --enable-libsrt --enable-libxml2 --enable-opengl --enable-libdav1d --enable-cuda-llvm --enable-gnutls --enable-libsvtav1 --enable-libvpx --enable-libaom --enable-nvenc --enable-nvdec --extra-libs=-lharfbuzz --extra-libs=-lm --extra-libs=-lshlwapi --extra-libs=-lmpg123 --extra-libs=-lpthread --extra-cflags=-DLIBTWOLAME_STATIC --extra-cflags=-DMODPLUG_STATIC --extra-cflags=-DCACA_STATIC --enable-amf --enable-libmfx --enable-gpl --enable-frei0r --enable-librubberband --enable-libvidstab --enable-libx264 --enable-libx265 --enable-avisynth --enable-libaribb24 --enable-libxvid --enable-libdavs2 --enable-libxavs2 --enable-libxavs --extra-cflags='-mtune=generic' --extra-cflags=-O3 --enable-static --disable-shared --prefix=/home/user/ffmpeg-windows-build-helpers/sandbox/cross_compilers/mingw-w64-x86_64/x86_64-w64-mingw32 --disable-libdav1d --enable-nonfree --enable-libfdk-aac --enable-decklink
6+
libavutil 56. 70.100 / 56. 70.100
7+
libavcodec 58.134.100 / 58.134.100
8+
libavformat 58. 76.100 / 58. 76.100
9+
libavdevice 58. 13.100 / 58. 13.100
10+
libavfilter 7.110.100 / 7.110.100
11+
libswscale 5. 9.100 / 5. 9.100
12+
libswresample 3. 9.100 / 3. 9.100
13+
libpostproc 55. 9.100 / 55. 9.100
14+
15+
================================================================================
16+
ffmpeg version n5.0.3-ffmpeg-windows-build-helpers Copyright (c) 2000-2022 the FFmpeg developers
17+
built with gcc 10.2.0 (GCC)
18+
configuration: --pkg-config=pkg-config --pkg-config-flags=--static --extra-version=ffmpeg-windows-build-helpers --enable-version3 --disable-debug --disable-w32threads --arch=x86_64 --target-os=mingw32 --cross-prefix=/home/user/ffmpeg-windows-build-helpers/sandbox/cross_compilers/mingw-w64-x86_64/bin/x86_64-w64-mingw32- --enable-libcaca --enable-gray --enable-fontconfig --enable-gmp --enable-libass --enable-libbluray --enable-libbs2b --enable-libflite --enable-libfreetype --enable-libfribidi --enable-libgme --enable-libgsm --enable-libilbc --enable-libmodplug --enable-libmp3lame --enable-libopencore-amrnb --enable-libopencore-amrwb --enable-libopus --enable-libsnappy --enable-libsoxr --enable-libspeex --enable-libtheora --enable-libtwolame --enable-libvo-amrwbenc --enable-libvorbis --enable-libwebp --enable-libzimg --enable-libzvbi --enable-libmysofa --enable-libopenjpeg --enable-libopenh264 --enable-libvmaf --enable-libsrt --enable-libxml2 --enable-opengl --enable-libdav1d --enable-cuda-llvm --enable-gnutls --enable-libsvtav1 --enable-libvpx --enable-libaom --enable-nvenc --enable-nvdec --extra-libs=-lharfbuzz --extra-libs=-lm --extra-libs=-lshlwapi --extra-libs=-lmpg123 --extra-libs=-lpthread --extra-cflags=-DLIBTWOLAME_STATIC --extra-cflags=-DMODPLUG_STATIC --extra-cflags=-DCACA_STATIC --enable-amf --enable-libmfx --enable-gpl --enable-frei0r --enable-librubberband --enable-libvidstab --enable-libx264 --enable-libx265 --enable-avisynth --enable-libaribb24 --enable-libxvid --enable-libdavs2 --enable-libxavs2 --enable-libxavs --extra-cflags='-mtune=generic' --extra-cflags=-O3 --enable-static --disable-shared --prefix=/home/user/ffmpeg-windows-build-helpers/sandbox/cross_compilers/mingw-w64-x86_64/x86_64-w64-mingw32 --enable-nonfree --enable-libfdk-aac --enable-decklink
19+
libavutil 57. 17.100 / 57. 17.100
20+
libavcodec 59. 18.100 / 59. 18.100
21+
libavformat 59. 16.100 / 59. 16.100
22+
libavdevice 59. 4.100 / 59. 4.100
23+
libavfilter 8. 24.100 / 8. 24.100
24+
libswscale 6. 4.100 / 6. 4.100
25+
libswresample 4. 3.100 / 4. 3.100
26+
libpostproc 56. 3.100 / 56. 3.100
27+
28+
================================================================================
29+
ffmpeg version n5.1.3-2-g77a43962e3-ffmpeg-windows-build-helpers Copyright (c) 2000-2022 the FFmpeg developers
30+
built with gcc 10.2.0 (GCC)
31+
configuration: --pkg-config=pkg-config --pkg-config-flags=--static --extra-version=ffmpeg-windows-build-helpers --enable-version3 --disable-debug --disable-w32threads --arch=x86_64 --target-os=mingw32 --cross-prefix=/home/user/ffmpeg-windows-build-helpers/sandbox/cross_compilers/mingw-w64-x86_64/bin/x86_64-w64-mingw32- --enable-libcaca --enable-gray --enable-fontconfig --enable-gmp --enable-libass --enable-libbluray --enable-libbs2b --enable-libflite --enable-libfreetype --enable-libfribidi --enable-libgme --enable-libgsm --enable-libilbc --enable-libmodplug --enable-libmp3lame --enable-libopencore-amrnb --enable-libopencore-amrwb --enable-libopus --enable-libsnappy --enable-libsoxr --enable-libspeex --enable-libtheora --enable-libtwolame --enable-libvo-amrwbenc --enable-libvorbis --enable-libwebp --enable-libzimg --enable-libzvbi --enable-libmysofa --enable-libopenjpeg --enable-libopenh264 --enable-libvmaf --enable-libsrt --enable-libxml2 --enable-opengl --enable-libdav1d --enable-cuda-llvm --enable-gnutls --enable-libsvtav1 --enable-libvpx --enable-libaom --enable-nvenc --enable-nvdec --extra-libs=-lharfbuzz --extra-libs=-lm --extra-libs=-lshlwapi --extra-libs=-lmpg123 --extra-libs=-lpthread --extra-cflags=-DLIBTWOLAME_STATIC --extra-cflags=-DMODPLUG_STATIC --extra-cflags=-DCACA_STATIC --enable-amf --enable-libmfx --enable-gpl --enable-frei0r --enable-librubberband --enable-libvidstab --enable-libx264 --enable-libx265 --enable-avisynth --enable-libaribb24 --enable-libxvid --enable-libdavs2 --enable-libxavs2 --enable-libxavs --extra-cflags='-mtune=generic' --extra-cflags=-O3 --enable-static --disable-shared --prefix=/home/user/ffmpeg-windows-build-helpers/sandbox/cross_compilers/mingw-w64-x86_64/x86_64-w64-mingw32 --enable-nonfree --enable-libfdk-aac --enable-decklink
32+
libavutil 57. 28.100 / 57. 28.100
33+
libavcodec 59. 37.100 / 59. 37.100
34+
libavformat 59. 27.100 / 59. 27.100
35+
libavdevice 59. 7.100 / 59. 7.100
36+
libavfilter 8. 44.100 / 8. 44.100
37+
libswscale 6. 7.100 / 6. 7.100
38+
libswresample 4. 7.100 / 4. 7.100
39+
libpostproc 56. 6.100 / 56. 6.100
40+
41+
================================================================================
42+
ffmpeg version n6.0-ffmpeg-windows-build-helpers Copyright (c) 2000-2023 the FFmpeg developers
43+
built with gcc 10.2.0 (GCC)
44+
configuration: --pkg-config=pkg-config --pkg-config-flags=--static --extra-version=ffmpeg-windows-build-helpers --enable-version3 --disable-debug --disable-w32threads --arch=x86_64 --target-os=mingw32 --cross-prefix=/home/user/ffmpeg-windows-build-helpers/sandbox/cross_compilers/mingw-w64-x86_64/bin/x86_64-w64-mingw32- --enable-libcaca --enable-gray --enable-fontconfig --enable-gmp --enable-libass --enable-libbluray --enable-libbs2b --enable-libflite --enable-libfreetype --enable-libfribidi --enable-libgme --enable-libgsm --enable-libilbc --enable-libmodplug --enable-libmp3lame --enable-libopencore-amrnb --enable-libopencore-amrwb --enable-libopus --enable-libsnappy --enable-libsoxr --enable-libspeex --enable-libtheora --enable-libtwolame --enable-libvo-amrwbenc --enable-libvorbis --enable-libwebp --enable-libzimg --enable-libzvbi --enable-libmysofa --enable-libopenjpeg --enable-libopenh264 --enable-libvmaf --enable-libsrt --enable-libxml2 --enable-opengl --enable-libdav1d --enable-cuda-llvm --enable-gnutls --enable-libsvtav1 --enable-libvpx --enable-libaom --enable-nvenc --enable-nvdec --extra-libs=-lharfbuzz --extra-libs=-lm --extra-libs=-lshlwapi --extra-libs=-lmpg123 --extra-libs=-lpthread --extra-cflags=-DLIBTWOLAME_STATIC --extra-cflags=-DMODPLUG_STATIC --extra-cflags=-DCACA_STATIC --enable-amf --enable-libmfx --enable-gpl --enable-frei0r --enable-librubberband --enable-libvidstab --enable-libx264 --enable-libx265 --enable-avisynth --enable-libaribb24 --enable-libxvid --enable-libdavs2 --enable-libxavs2 --enable-libxavs --extra-cflags='-mtune=generic' --extra-cflags=-O3 --enable-static --disable-shared --prefix=/home/user/ffmpeg-windows-build-helpers/sandbox/cross_compilers/mingw-w64-x86_64/x86_64-w64-mingw32 --enable-nonfree --enable-libfdk-aac --enable-decklink
45+
libavutil 58. 2.100 / 58. 2.100
46+
libavcodec 60. 3.100 / 60. 3.100
47+
libavformat 60. 3.100 / 60. 3.100
48+
libavdevice 60. 1.100 / 60. 1.100
49+
libavfilter 9. 3.100 / 9. 3.100
50+
libswscale 7. 1.100 / 7. 1.100
51+
libswresample 4. 10.100 / 4. 10.100
52+
libpostproc 57. 1.100 / 57. 1.100
53+
54+
================================================================================
55+
ffmpeg version N-112494-g393d1ee541-ffmpeg-windows-build-helpers Copyright (c) 2000-2023 the FFmpeg developers
56+
built with gcc 10.2.0 (GCC)
57+
configuration: --pkg-config=pkg-config --pkg-config-flags=--static --extra-version=ffmpeg-windows-build-helpers --enable-version3 --disable-debug --disable-w32threads --arch=x86_64 --target-os=mingw32 --cross-prefix=/home/user/ffmpeg-windows-build-helpers/sandbox/cross_compilers/mingw-w64-x86_64/bin/x86_64-w64-mingw32- --enable-libcaca --enable-gray --enable-fontconfig --enable-gmp --enable-libass --enable-libbluray --enable-libbs2b --enable-libflite --enable-libfreetype --enable-libfribidi --enable-libgme --enable-libgsm --enable-libilbc --enable-libmodplug --enable-libmp3lame --enable-libopencore-amrnb --enable-libopencore-amrwb --enable-libopus --enable-libsnappy --enable-libsoxr --enable-libspeex --enable-libtheora --enable-libtwolame --enable-libvo-amrwbenc --enable-libvorbis --enable-libwebp --enable-libzimg --enable-libzvbi --enable-libmysofa --enable-libopenjpeg --enable-libopenh264 --enable-libvmaf --enable-libsrt --enable-libxml2 --enable-opengl --enable-libdav1d --enable-cuda-llvm --enable-gnutls --enable-libsvtav1 --enable-libvpx --enable-libaom --enable-nvenc --enable-nvdec --extra-libs=-lharfbuzz --extra-libs=-lm --extra-libs=-lshlwapi --extra-libs=-lmpg123 --extra-libs=-lpthread --extra-cflags=-DLIBTWOLAME_STATIC --extra-cflags=-DMODPLUG_STATIC --extra-cflags=-DCACA_STATIC --enable-amf --enable-libmfx --enable-libaribcaption --enable-gpl --enable-frei0r --enable-librubberband --enable-libvidstab --enable-libx264 --enable-libx265 --enable-avisynth --enable-libaribb24 --enable-libxvid --enable-libdavs2 --enable-libxavs2 --enable-libxavs --extra-cflags='-mtune=generic' --extra-cflags=-O3 --enable-static --disable-shared --prefix=/home/user/ffmpeg-windows-build-helpers/sandbox/cross_compilers/mingw-w64-x86_64/x86_64-w64-mingw32 --enable-nonfree --enable-libfdk-aac --enable-decklink
58+
libavutil 58. 27.100 / 58. 27.100
59+
libavcodec 60. 30.102 / 60. 30.102
60+
libavformat 60. 15.100 / 60. 15.100
61+
libavdevice 60. 2.101 / 60. 2.101
62+
libavfilter 9. 11.100 / 9. 11.100
63+
libswscale 7. 4.100 / 7. 4.100
64+
libswresample 4. 11.100 / 4. 11.100
65+
libpostproc 57. 2.100 / 57. 2.100
66+

extra/README.md

+19-4
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,7 @@
11
# ffmpeg windows cross compile helper extra script
22

3-
* 2023/10/15 FFmpeg 4.4.4
4-
53
* This is Patch for Windows WSL Ubuntu
6-
* FFmpeg 4.4.4 for Windows 64-bit with FDK-AAC(--disable-nonfree=n, --build-ffmpeg-static=y)
4+
* FFmpeg for Windows 64-bit with FDK-AAC(--disable-nonfree=n, --build-ffmpeg-static=y)
75
* disable Tesseract OCR function
86

97
* Environment
@@ -34,6 +32,20 @@ cd ffmpeg-windows-build-helpers
3432
# Windows 10 WLS Ubuntu
3533
./extra/make.sh
3634
35+
# Default Build FFmpeg 4.4.4
36+
# If you need other versions. Type as follows
37+
./extra/make.sh n5.0.3
38+
./extra/make.sh n5.1.3
39+
./extra/make.sh n6.0
40+
./extra/make.sh master
41+
42+
# You can build each FFmpeg verisons following
43+
# The build time from the 2nd time onwards is about 10 minutes
44+
./extra/make.sh
45+
./extra/make.sh n5.0.3
46+
./extra/make.sh n5.1.3
47+
./extra/make.sh n6.0
48+
./extra/make.sh master
3749
3850
* FFmpeg is Win64 (64-bit only).
3951
Edit ./extra/build.sh if you want the 32-bit version .
@@ -51,7 +63,7 @@ Take about 1 to few hours depending on machine specs
5163
# for more details visit following URL
5264
http://www.neko.ne.jp/~freewing/software/windows_compile_ffmpeg_enable_fdk_aac/
5365

54-
# 2023/10/15 FFmpeg 4.4.4 ffmpeg.exe -version
66+
# 2023/10/21 FFmpeg 4.4.4 ffmpeg.exe -version
5567
```
5668
ffmpeg.exe -version
5769
ffmpeg version n4.4.4-ffmpeg-windows-build-helpers Copyright (c) 2000-2023 the FFmpeg developers
@@ -67,3 +79,6 @@ libswresample 3. 9.100 / 3. 9.100
6779
libpostproc 55. 9.100 / 55. 9.100
6880
```
6981

82+
# For other versions
83+
please see FFmpeg_versions.txt
84+

extra/build.sh

+25-7
Original file line numberDiff line numberDiff line change
@@ -3,16 +3,34 @@
33
# Copyright (C) 2023 FREE WING,Y.Sakamoto, the script is under the GPLv3, but output FFmpeg's executables aren't
44
# set -x
55

6-
echo "Windows WSL patch"
7-
bash ./extra/wsl_patch_2023_05_for_n4_4_x.sh
8-
bash ./extra/wsl_patch_2023_10_for_n4_4_x.sh
6+
FFMPEG_VER="n4.4.4"
7+
if [ -n "$1" ]; then
8+
FFMPEG_VER="$1"
9+
fi
910

10-
FFMPEG_VER=4.4.4
11+
echo "FFmpeg $FFMPEG_VER for Windows"
12+
13+
if [ ! "$FFMPEG_VER" = "master" ]; then
14+
15+
if [ ! "${FFMPEG_VER:0:4}" = "n6.1" ]; then
16+
echo "Windows WSL patch require: n4.x, n5.x, n6.0"
17+
bash ./extra/wsl_patch_2023_05_for_n4_4_x.sh
18+
fi
19+
20+
if [ "${FFMPEG_VER:0:3}" = "n5." ]; then
21+
if [ ! "${FFMPEG_VER:0:4}" = "n5.0" ]; then
22+
echo "Windows WSL patch require: n5.1, n5.2"
23+
bash ./extra/wsl_patch_2023_10_for_n5_x_x.sh
24+
fi
25+
fi
26+
27+
echo "Windows WSL patch require: n4.x, n5.x, n6.x"
28+
bash ./extra/wsl_patch_2023_10_for_n4_4_x.sh
29+
fi
1130

12-
echo "FFmpeg "$FFMPEG_VER" for Windows"
1331
echo "Default: --build-ffmpeg-static=y --build-intel-qsv=y --build-amd-amf=y"
14-
echo "Add Args: --disable-nonfree=n --ffmpeg-git-checkout-version=n"$FFMPEG_VER
32+
echo "Add Args: --disable-nonfree=n --ffmpeg-git-checkout-version=$FFMPEG_VER"
1533

1634
# --compiler-flavors=multi,win32,win64
17-
time ./cross_compile_ffmpeg.sh --disable-nonfree=n --ffmpeg-git-checkout-version=n"$FFMPEG_VER" --compiler-flavors=win64
35+
time ./cross_compile_ffmpeg.sh --disable-nonfree=n --compiler-flavors=win64 --ffmpeg-git-checkout-version=$FFMPEG_VER
1836

extra/copy_ffmpeg_exe.sh

+17-8
Original file line numberDiff line numberDiff line change
@@ -3,17 +3,26 @@
33
# Copyright (C) 2023 FREE WING,Y.Sakamoto, the script is under the GPLv3, but output FFmpeg's executables aren't
44
# set -x
55

6-
echo "Copy FFmpeg execute files to Windows C:\ffmpeg_tmp directory"
6+
FFMPEG_VER="n4.4.4"
7+
if [ -n "$1" ]; then
8+
FFMPEG_VER="$1"
9+
fi
710

8-
ls -l ./sandbox/win64/ffmpeg_git_with_fdk_aac_n4.4.4/ff*.exe
11+
WIN_FFMPEG_DIR=/mnt/c/ffmpeg_tmp_$FFMPEG_VER
12+
13+
echo "FFmpeg $FFMPEG_VER for Windows"
14+
15+
echo "Copy FFmpeg execute files to Windows C:\ffmpeg_tmp_$FFMPEG_VER directory"
16+
17+
ls -l ./sandbox/win64/ffmpeg_git_with_fdk_aac_$FFMPEG_VER/ff*.exe
918
ls -l ./sandbox/win64/x264/x*.exe
1019
ls -l ./sandbox/win64/x265/8bit/x*.exe
1120

12-
mkdir /mnt/c/ffmpeg_tmp/
13-
cp ./sandbox/win64/ffmpeg_git_with_fdk_aac_n4.4.4/ff*.exe /mnt/c/ffmpeg_tmp/
14-
cp ./sandbox/win64/x264/x*.exe /mnt/c/ffmpeg_tmp/
15-
cp ./sandbox/win64/x265/8bit/x*.exe /mnt/c/ffmpeg_tmp/
16-
rm /mnt/c/ffmpeg_tmp/ff*_g.exe
21+
mkdir ${WIN_FFMPEG_DIR}/
22+
cp ./sandbox/win64/ffmpeg_git_with_fdk_aac_$FFMPEG_VER/ff*.exe ${WIN_FFMPEG_DIR}/
23+
cp ./sandbox/win64/x264/x*.exe ${WIN_FFMPEG_DIR}/
24+
cp ./sandbox/win64/x265/8bit/x*.exe ${WIN_FFMPEG_DIR}/
25+
rm ${WIN_FFMPEG_DIR}/ff*_g.exe
1726

18-
ls -l /mnt/c/ffmpeg_tmp/
27+
ls -l ${WIN_FFMPEG_DIR}/
1928

extra/make.sh

+38-2
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,17 @@
33
# Copyright (C) 2023 FREE WING,Y.Sakamoto, the script is under the GPLv3, but output FFmpeg's executables aren't
44
# set -x
55

6+
FFMPEG_VER="n4.4.4"
7+
# n4.4.4
8+
# n5.0.3
9+
# n5.1.3
10+
# n6.0
11+
# master
12+
13+
if [ -n "$1" ]; then
14+
FFMPEG_VER="$1"
15+
fi
16+
617
WIN_VER=""
718
WIN_CMD_EXE=/mnt/c/Windows/System32/cmd.exe
819
if [ -e $WIN_CMD_EXE ]; then
@@ -24,7 +35,13 @@ if [ -z "$WIN_VER" ]; then
2435
exit 1
2536
fi
2637

27-
echo "FFmpeg for Windows $WIN_VER"
38+
if [ -e cross_compile_ffmpeg.sh_org ]; then
39+
cp cross_compile_ffmpeg.sh_org cross_compile_ffmpeg.sh
40+
else
41+
cp cross_compile_ffmpeg.sh cross_compile_ffmpeg.sh_org
42+
fi
43+
44+
echo "FFmpeg $FFMPEG_VER for Windows $WIN_VER"
2845
echo "Make file for WSL Ubuntu"
2946

3047
# WSL Debian
@@ -48,6 +65,25 @@ if [ "$WIN_VER" = "10" ]; then
4865
fi
4966

5067
echo $'\a'
51-
bash ./extra/build.sh
68+
bash ./extra/build.sh $FFMPEG_VER
5269
echo $'\a'
5370

71+
echo "."
72+
echo "."
73+
echo "."
74+
75+
ls -l ./sandbox/win64/ffmpeg_git_with_fdk_aac_$FFMPEG_VER/ff*.exe 2> /dev/null
76+
if [ $? -eq 0 ]; then
77+
echo "========"
78+
echo "Build Success"
79+
echo "========"
80+
echo "Type"
81+
echo " './extra/copy_ffmpeg_exe.sh $FFMPEG_VER'"
82+
echo "to Copy FFmpeg.exe to Windows C:\\ffmpeg_tmp_$FFMPEG_VER Directory"
83+
echo "========"
84+
else
85+
echo "========"
86+
echo "Build Failed"
87+
echo "========"
88+
fi
89+

extra/wsl_patch_2023_05_for_n4_4_x.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,5 +13,5 @@ echo "2023/05/05 no member named 'compressed_ten_bit_format'"
1313
# https://github.com/FFmpeg/FFmpeg/commit/031f1561cd286596cdb374da32f8aa816ce3b135
1414
# avcodec/libsvtav1: remove compressed_ten_bit_format and simplify allo…
1515
# patch git cherry-pick 031f156
16-
sed -i -e "s/ cd \$output_dir/ cd \$output_dir\n git cherry-pick 031f156/g" cross_compile_ffmpeg.sh
16+
sed -i -e "s/ cd \$output_dir/ cd \$output_dir\n git cherry-pick 031f156/g" cross_compile_ffmpeg.sh
1717

extra/wsl_patch_2023_10_for_n4_4_x.sh

+2
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,8 @@ echo "2023/10/15 Disable libaribcaption --enable-libaribcaption"
99
# Because FFmpeg 4.4.x doesn't have this option
1010
# #693 --enable-libaribcaption #694
1111
# https://github.com/rdp/ffmpeg-windows-build-helpers/pull/694
12+
# lavc/libaribcaption.c: add ARIB caption decoder using libaribcaption
13+
# https://github.com/FFmpeg/FFmpeg/commit/b6138633cdf2ecae22c4c02029e91245c430c4fe
1214
# config_options+=" --enable-libaribcaption" # libaribcatption (MIT licensed)
1315
sed -i -e "s/--enable-libaribcaption//g" cross_compile_ffmpeg.sh
1416
sed -i -e "s/ build_libaribcaption/ # build_libaribcaption/g" cross_compile_ffmpeg.sh

extra/wsl_patch_2023_10_for_n5_x_x.sh

+23
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
#!/usr/bin/env bash
2+
# ffmpeg windows cross compile helper extra script, see github repo README
3+
# Copyright (C) 2023 FREE WING,Y.Sakamoto, the script is under the GPLv3, but output FFmpeg's executables aren't
4+
# set -x
5+
6+
echo "This is Patch for WSL Ubuntu 2023/10/20"
7+
8+
echo "2023/05/05 no member named 'vbv_bufsize'"
9+
# https://github.com/FFmpeg/FFmpeg/commit/1c6fd7d756afe0f8b7df14dbf7a95df275f8f5ee
10+
# avcodec/libsvtav1: replace vbv_bufsize with maximum_buffer_size_ms
11+
# patch git cherry-pick 1c6fd7d
12+
# https://bugs.launchpad.net/ubuntu/+source/ffmpeg/+bug/2024487
13+
# ffmpeg 5.1.3u1 fails to compile with svt-av1 1.5.0
14+
# libavcodec/libsvtav1.c: In function 'config_enc_params':
15+
# libavcodec/libsvtav1.c:182:10: error: 'EbSvtAv1EncConfiguration' has no member named 'vbv_bufsize'
16+
# 182 | param->vbv_bufsize = avctx->rc_buffer_size;
17+
# | ^~
18+
# libavcodec/libsvtav1.c:299:34: error: 'EbSvtAv1EncConfiguration' has no member named 'vbv_bufsize'
19+
# 299 | avctx->rc_buffer_size = param->vbv_bufsize;
20+
# | ^~
21+
# make: *** [ffbuild/common.mak:81: libavcodec/libsvtav1.o] Error 1
22+
sed -i -e "s/ cd \$output_dir/ cd \$output_dir\n git cherry-pick 1c6fd7d/g" cross_compile_ffmpeg.sh
23+

0 commit comments

Comments
 (0)