Merge branch 'dev' of github.com:m1k1o/neko into dev

This commit is contained in:
m1k1o 2020-12-18 19:13:40 +01:00
commit c8b4c130c8
4 changed files with 2 additions and 5 deletions

View File

@ -1,6 +1,6 @@
FROM m1k1o/neko:base FROM m1k1o/neko:base
ARG SRC_URL="https://github.com/macchrome/linchrome/releases/download/v86.0.4240.111-r800218-portable-ungoogled-Lin64/ungoogled-chromium_86.0.4240.111_1.vaapi_polly_linux.tar.xz" ARG SRC_URL="https://github.com/macchrome/linchrome/releases/download/v87.0.4280.66-r812852-portable-ungoogled-Lin64/ungoogled-chromium_87.0.4280.66_1.vaapi_linux.tar.xz"
# #
# install custom chromium build from woolyss with support for hevc/x265 # install custom chromium build from woolyss with support for hevc/x265

View File

@ -1,4 +1,4 @@
{ {
"external_crx": "/usr/share/chromium/extensions/fjoaledfpmneenckfbpdfhkmimnjocfa.crx", "external_crx": "/usr/share/chromium/extensions/fjoaledfpmneenckfbpdfhkmimnjocfa.crx",
"external_version": "2.17.2" "external_version": "2.21.0"
} }

View File

@ -18,6 +18,3 @@ services:
NEKO_BIND: :8080 NEKO_BIND: :8080
NEKO_EPR: 52000-52010 NEKO_EPR: 52000-52010
NEKO_NAT1TO1: 192.168.1.20 NEKO_NAT1TO1: 192.168.1.20
NEKO_BROADCAST: 'true'
NEKO_RTMP: 'rtmp://192.168.1.20/live/neko'