Skip to content

Commit

Permalink
Merge branch 'dev' of github.com:m1k1o/neko into dev
Browse files Browse the repository at this point in the history
  • Loading branch information
m1k1o committed Dec 18, 2020
2 parents 584c94b + 2ef64e2 commit c8b4c13
Show file tree
Hide file tree
Showing 4 changed files with 2 additions and 5 deletions.
2 changes: 1 addition & 1 deletion .m1k1o/chromium/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
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
Expand Down
Binary file modified .m1k1o/chromium/extensions/fjoaledfpmneenckfbpdfhkmimnjocfa.crx
Binary file not shown.
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{
"external_crx": "/usr/share/chromium/extensions/fjoaledfpmneenckfbpdfhkmimnjocfa.crx",
"external_version": "2.17.2"
"external_version": "2.21.0"
}
3 changes: 0 additions & 3 deletions docker-compose.dev.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,3 @@ services:
NEKO_BIND: :8080
NEKO_EPR: 52000-52010
NEKO_NAT1TO1: 192.168.1.20
NEKO_BROADCAST: 'true'
NEKO_RTMP: 'rtmp://192.168.1.20/live/neko'

0 comments on commit c8b4c13

Please sign in to comment.