Merge branch 'master' into channel-edits-0

This commit is contained in:
James E. Kemp 2021-07-21 12:14:39 -07:00 committed by GitHub
commit 34938a25f3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -97,7 +97,7 @@ http://redlabmcdn.s.llnwi.net/jp04/bs09hd/playlist.m3u8
#EXTINF:-1 tvg-id="Star2.jp" tvg-name="Star 2" tvg-country="JP" tvg-language="Japanese" tvg-logo="" group-title="",Star 2
http://redlabmcdn.s.llnwi.net/jp04/bs10hd/playlist.m3u8
#EXTINF:-1 tvg-id="TBS.jp" tvg-name="TBS" tvg-country="JP" tvg-language="Japanese" tvg-logo="" group-title="",TBS
http://redlabmcdn.s.llnwi.net/jp04/ryowa4hd/playlist.m3u8
http://redlabmcdn.s.llnwi.net/jp04/ryowa5hd/playlist.m3u8
#EXTINF:-1 tvg-id="TBS.jp" tvg-name="TBS" tvg-country="JP" tvg-language="Japanese" tvg-logo="" group-title="",TBS
https://tbs.mov3.co/hls/tbs.m3u8
#EXTINF:-1 tvg-id="TokyoMX.jp" tvg-name="Tokyo MX (Webcam Stream)" tvg-country="JP" tvg-language="Japanese" tvg-logo="https://upload.wikimedia.org/wikipedia/commons/thumb/6/6f/Tokyo_metropolitan_television_logo_%28rainbow%29.svg/800px-Tokyo_metropolitan_television_logo_%28rainbow%29.svg.png" group-title="Local",Tokyo MX (Webcam Stream)
@ -113,7 +113,7 @@ https://movie.mcas.jp/mcas/mx2_2/master.m3u8
#EXTINF:-1 tvg-id="TokyoMX2.jp" tvg-name="Tokyo MX2" tvg-country="JP" tvg-language="Japanese" tvg-logo="https://upload.wikimedia.org/wikipedia/commons/thumb/6/6f/Tokyo_metropolitan_television_logo_%28rainbow%29.svg/800px-Tokyo_metropolitan_television_logo_%28rainbow%29.svg.png" group-title="Local",Tokyo MX2 (360p)
https://movie.mcas.jp/mcas/smil:mx2_prod.smil/master.m3u8
#EXTINF:-1 tvg-id="TVAsahi1.jp" tvg-name="TV Asahi 1" tvg-country="JP" tvg-language="" tvg-logo="" group-title="",TV Asahi 1
http://122.155.180.8:5021/live/223
http://redlabmcdn.s.llnwi.net/jp04/ryowa4hd/playlist.m3u8
#EXTINF:-1 tvg-id="TVTokyo.jp" tvg-name="TV Tokyo" tvg-country="JP" tvg-language="Japanese" tvg-logo="https://i.imgur.com/vgEnHX6.png" group-title="",TV Tokyo
http://redlabmcdn.s.llnwi.net/jp04/ryowa6hd/playlist.m3u8
#EXTINF:-1 tvg-id="WakuWakuJapan.jp" tvg-name="WakuWaku Japan" tvg-country="JP" tvg-language="" tvg-logo="https://www.dialog.lk/dialogdocroot/content/images/channel-highlights/waku-waku-large.png" group-title="",WakuWaku Japan