Merge branch 'master' into SPHD2

yt4687 · Nov 5, 2020 · 0205888 · 0205888
2 parents 44968da + c6cbdb2
commit 0205888
Show file tree

Hide file tree

Showing 32 changed files with 223 additions and 42 deletions.
diff --git a/README.md b/README.md
diff --git a/bin/ffmpeg/LICENSE.txt → bin/FFmpeg/LICENSE.txt b/bin/ffmpeg/LICENSE.txt → bin/FFmpeg/LICENSE.txt
diff --git a/bin/ffmpeg/avcodec-58.dll → bin/FFmpeg/avcodec-58.dll b/bin/ffmpeg/avcodec-58.dll → bin/FFmpeg/avcodec-58.dll
diff --git a/bin/ffmpeg/avdevice-58.dll → bin/FFmpeg/avdevice-58.dll b/bin/ffmpeg/avdevice-58.dll → bin/FFmpeg/avdevice-58.dll
diff --git a/bin/ffmpeg/avfilter-7.dll → bin/FFmpeg/avfilter-7.dll b/bin/ffmpeg/avfilter-7.dll → bin/FFmpeg/avfilter-7.dll
diff --git a/bin/ffmpeg/avformat-58.dll → bin/FFmpeg/avformat-58.dll b/bin/ffmpeg/avformat-58.dll → bin/FFmpeg/avformat-58.dll
diff --git a/bin/ffmpeg/avresample-4.dll → bin/FFmpeg/avresample-4.dll b/bin/ffmpeg/avresample-4.dll → bin/FFmpeg/avresample-4.dll
diff --git a/bin/ffmpeg/avutil-56.dll → bin/FFmpeg/avutil-56.dll b/bin/ffmpeg/avutil-56.dll → bin/FFmpeg/avutil-56.dll
diff --git a/bin/ffmpeg/ffmpeg-tvrp.exe → bin/FFmpeg/ffmpeg-tvrp.exe b/bin/ffmpeg/ffmpeg-tvrp.exe → bin/FFmpeg/ffmpeg-tvrp.exe
diff --git a/bin/ffmpeg/ffprobe-tvrp.exe → bin/FFmpeg/ffprobe-tvrp.exe b/bin/ffmpeg/ffprobe-tvrp.exe → bin/FFmpeg/ffprobe-tvrp.exe
diff --git a/bin/ffmpeg/postproc-55.dll → bin/FFmpeg/postproc-55.dll b/bin/ffmpeg/postproc-55.dll → bin/FFmpeg/postproc-55.dll
diff --git a/bin/ffmpeg/swresample-3.dll → bin/FFmpeg/swresample-3.dll b/bin/ffmpeg/swresample-3.dll → bin/FFmpeg/swresample-3.dll
diff --git a/bin/ffmpeg/swscale-5.dll → bin/FFmpeg/swscale-5.dll b/bin/ffmpeg/swscale-5.dll → bin/FFmpeg/swscale-5.dll
diff --git a/bin/NVEncC/NVEncC-tvrp.exe b/bin/NVEncC/NVEncC-tvrp.exe
diff --git a/bin/NVEncC/NVEnc_readme.txt b/bin/NVEncC/NVEnc_readme.txt
diff --git a/bin/QSVEncC/QSVEncC-tvrp.exe b/bin/QSVEncC/QSVEncC-tvrp.exe
diff --git a/bin/QSVEncC/QSVEnc_readme.txt b/bin/QSVEncC/QSVEnc_readme.txt
diff --git a/bin/VCEEncC/VCEEncC-tvrp.exe b/bin/VCEEncC/VCEEncC-tvrp.exe
diff --git a/bin/VCEEncC/VCEEnc_readme.txt b/bin/VCEEncC/VCEEnc_readme.txt
diff --git a/bin/VCEEncC/avcodec-58.dll b/bin/VCEEncC/avcodec-58.dll
diff --git a/bin/VCEEncC/avdevice-58.dll b/bin/VCEEncC/avdevice-58.dll
diff --git a/bin/VCEEncC/avfilter-7.dll b/bin/VCEEncC/avfilter-7.dll
diff --git a/bin/VCEEncC/avformat-58.dll b/bin/VCEEncC/avformat-58.dll
diff --git a/bin/VCEEncC/avutil-56.dll b/bin/VCEEncC/avutil-56.dll
diff --git a/bin/VCEEncC/swresample-3.dll b/bin/VCEEncC/swresample-3.dll
diff --git a/data/version.txt b/data/version.txt
diff --git a/docs/Release_Notes.md b/docs/Release_Notes.md
diff --git a/docs/Reverse_Proxy.md b/docs/Reverse_Proxy.md
diff --git a/htdocs/files/index.js b/htdocs/files/index.js
diff --git a/htdocs/files/settings.js b/htdocs/files/settings.js
diff --git a/htdocs/index.php b/htdocs/index.php
diff --git a/modules/require.php b/modules/require.php