From cfd3ea8daa3dc646ef849f5cdb38c30922c141d4 Mon Sep 17 00:00:00 2001 From: Alsturit Date: Sun, 17 Jul 2022 21:56:40 -0500 Subject: [PATCH] Resolve conflict --- streams/kr.m3u | 35 +++++++++++++++++------------------ 1 file changed, 17 insertions(+), 18 deletions(-) diff --git a/streams/kr.m3u b/streams/kr.m3u index c78561bd9..aa934939b 100644 --- a/streams/kr.m3u +++ b/streams/kr.m3u @@ -1,8 +1,8 @@ #EXTM3U -#EXTINF:-1 tvg-id="AniplusAsia.sg" status="online",Aniplus (Indonesian subtitle) (576p) [Geo-blocked] -http://210.210.155.37/dr9445/h/h02/index.m3u8 #EXTINF:-1 tvg-id="AniplusAsia.sg" status="error",Aniplus (Indonesian subtitle) (576p) [Geo-blocked] http://210.210.155.35/dr9445/h/h02/index.m3u8 +#EXTINF:-1 tvg-id="AniplusAsia.sg" status="error",Aniplus (Indonesian subtitle) (576p) [Geo-blocked] +http://210.210.155.37/dr9445/h/h02/index.m3u8 #EXTINF:-1 tvg-id="ArirangTV.kr" status="online",Arirang (720p) http://amdlive-ch01.ctnd.com.edgesuite.net/arirang_1ch/smil:arirang_1ch.smil/playlist.m3u8 #EXTINF:-1 tvg-id="ArirangTV.kr" status="online",Arirang (720p) @@ -27,7 +27,7 @@ http://cgntv-glive.ofsdelivery.net/live/cgntv_kr01/playlist.m3u8 http://cgntv-glive.ofsdelivery.net/live/cgntv_kr02/playlist.m3u8 #EXTINF:-1 tvg-id="ChuncheonMBCTV.kr" status="online",춘천MBC (MBC Chuncheon) (1080p) [Not 24/7] https://stream.chmbc.co.kr/live/TV/playlist.m3u8 -#EXTINF:-1 tvg-id="CJBTV.kr" status="online",CJB청주방송 (SBS 淸州) (540p) [Not 24/7] +#EXTINF:-1 tvg-id="CJBTV.kr" status="blocked",CJB청주방송 (SBS 淸州) (540p) [Not 24/7] http://1.222.207.80:1935/live/cjbtv/playlist.m3u8 #EXTINF:-1 tvg-id="CJOnStyle.kr" status="online",CJ OnStyle https://live-ch1.cjonstyle.net/cjmalllive/stream2/playlist.m3u8 @@ -59,10 +59,10 @@ http://free.fullspeed.tv/iptv-query?streaming-ip=https://www.youtube.com/channel http://necgokr2-724.acs.wecandeo.com/ms/2528/724/index_1.m3u8 #EXTINF:-1 tvg-id="GCN.kr" status="online",GCN24 Korean (480p) [Not 24/7] http://liveko24-manminglobal3.ktcdn.co.kr/liveko24/gcnko_high/playlist.m3u8 +#EXTINF:-1 tvg-id="GCN.kr" status="timeout",GCN24 Korean (1080p) [Not 24/7] +http://free.fullspeed.tv/iptv-query?streaming-ip=https://www.youtube.com/channel/UCqGxkgVnPc7arUR7MdCi99g/live #EXTINF:-1 tvg-id="GCN.kr" status="error",GCN (1080p) [Not 24/7] http://free.fullspeed.tv/iptv-query?streaming-ip=https://www.youtube.com/channel/UCFb1QuujJWU3nuUMCNPhNiA/live -#EXTINF:-1 tvg-id="GCN.kr" status="error",GCN24 Korean (1080p) [Not 24/7] -http://free.fullspeed.tv/iptv-query?streaming-ip=https://www.youtube.com/channel/UCqGxkgVnPc7arUR7MdCi99g/live #EXTINF:-1 tvg-id="GCNAmerica.us" status="online",GCN24 English (720p) [Not 24/7] http://liveen24-manminglobal3.ktcdn.co.kr/liveen24/gcnus_high/playlist.m3u8 #EXTINF:-1 tvg-id="GSMyShop.kr" status="online",GS My Shop (1080p) @@ -87,16 +87,14 @@ http://kbs-dokdo.gscdn.com/dokdo_300/dokdo_300.stream/playlist.m3u8 http://kbs-dokdo.gscdn.com/sec_kbshomepage_300/sec_kbshomepage_300.stream/playlist.m3u8 #EXTINF:-1 tvg-id="KBSWorld.kr" status="online",KBS World (720p) https://kbsworld-ott.akamaized.net/hls/live/2002341/kbsworld/master.m3u8 -#EXTINF:-1 tvg-id="KBSWorld.kr" status="online",KBS World (720p) -https://wms4-kortv.akamaized.net/a_live/63719963/smil:20ch011.smil/playlist.m3u8 #EXTINF:-1 tvg-id="KBSWorld.kr" status="online",KBS World (Vietnamese Subtitles) (720p) https://livecdn.fptplay.net/sdb/kbs_hls.smil/playlist.m3u8 +#EXTINF:-1 tvg-id="KBSWorld.kr" status="online",KBS World (720p) +https://wms4-kortv.akamaized.net/a_live/63719963/smil:20ch011.smil/playlist.m3u8 #EXTINF:-1 tvg-id="KCTV.kr" status="online",KCTV 광주 CH05 (720p) [Not 24/7] http://119.77.96.184:1935/chn05/chn05/playlist.m3u8 #EXTINF:-1 tvg-id="KNNTV.kr" status="online",SBS KNN (450p) [Not 24/7] http://211.220.195.200:1935/live/mp4:KnnTV.sdp/playlist.m3u8 -#EXTINF:-1 tvg-id="KNNTV.kr",SBS KNN (1080p) -http://220.95.92.160:9981/stream/channelid/1445999617 #EXTINF:-1 tvg-id="KPlus.sg" status="online",K+ (Indonesian subtitle) (576p) [Geo-blocked] http://210.210.155.35/uq2663/h/h08/index.m3u8 #EXTINF:-1 tvg-id="KPlus.sg" status="error",K+ (Indonesian subtitle) (576p) @@ -109,19 +107,18 @@ http://123.254.72.24:1935/tvlive/livestream2/playlist.m3u8 http://183.110.27.87/mtnlive/720/playlist.m3u8 #EXTINF:-1 tvg-id="NBS.kr" status="online",NBS Korea Agricultural Broadcasting (720p) https://media.joycorp.co.kr:4443/live/ngrp:live_all/playlist.m3u8 - -#EXTINF:-1 tvg-id="TBCTV.kr" status="online",TBC SBS (540p) +#EXTINF:-1 tvg-id="TBCTV.kr" status="blocked",TBC SBS (540p) http://221.157.125.239:1935/live/psike/playlist.m3u8 #EXTINF:-1 tvg-id="TBSTV.kr" status="online",TBS Seoul (720p) https://cdntv.tbs.seoul.kr/tbs/tbs_tv_web.smil/playlist.m3u8 -#EXTINF:-1 tvg-id="TVNAsia.hk" status="online",tvN Asia (Indonesian Subtitle) (576p) [Geo-blocked] -http://210.210.155.35/dr9445/h/h20/index.m3u8 -#EXTINF:-1 tvg-id="TVNAsia.hk" status="error",tvN Asia (Indonesian Subtitle) (576p) +#EXTINF:-1 tvg-id="TVNAsia.hk" status="online",tvN Asia (Indonesian Subtitle) (576p) http://210.210.155.37/dr9445/h/h20/index.m3u8 -#EXTINF:-1 tvg-id="TVNMovies.hk" status="online",tvN Movies (Indonesian Subtitle) (576p) [Geo-blocked] -http://210.210.155.35/dr9445/h/h21/index.m3u8 +#EXTINF:-1 tvg-id="TVNAsia.hk" status="error",tvN Asia (Indonesian Subtitle) (576p) [Geo-blocked] +http://210.210.155.35/dr9445/h/h20/index.m3u8 #EXTINF:-1 tvg-id="TVNMovies.hk" status="online",tvN Movies (Indonesian Subtitle) (576p) http://210.210.155.37/dr9445/h/h21/index.m3u8 +#EXTINF:-1 tvg-id="TVNMovies.hk" status="error",tvN Movies (Indonesian Subtitle) (576p) [Geo-blocked] +http://210.210.155.35/dr9445/h/h21/index.m3u8 #EXTINF:-1 tvg-id="TVWorkNet.kr" status="online",TVWorkNet (480p) http://live.worktv.or.kr:1935/live/wowtvlive1.sdp/playlist.m3u8 #EXTINF:-1 tvg-id="YeosuMBCTV.kr" status="online",MBC Yeosu (720p) [Not 24/7] @@ -130,10 +127,10 @@ https://5c3639aa99149.streamlock.net/live_TV/tv/playlist.m3u8 http://free.fullspeed.tv/iptv-query?streaming-ip=https://www.youtube.com/channel/UChlgI3UHCOnwUGzWzbJ3H5w/live #EXTINF:-1 tvg-id="YTNDMB.kr" status="timeout",YTN DMB http://free.fullspeed.tv/iptv-query?streaming-ip=https://www.youtube.com/channel/UC38IlqMxZ_YtFg3eSGmmJnQ/live -#EXTINF:-1 tvg-id="YTNScience.kr" status="online",YTN SCIENCE (720p) [Not 24/7] -http://free.fullspeed.tv/iptv-query?streaming-ip=https://www.youtube.com/channel/UCZdBJIbJz0P9xyFipgOj1fA/live #EXTINF:-1 tvg-id="YTNScience.kr" status="online",YTN SCIENCE (270p) http://slive.sciencetv.kr:1935/science/yslive_20140419_1/playlist.m3u8 +#EXTINF:-1 tvg-id="YTNScience.kr" status="error",YTN SCIENCE (720p) [Not 24/7] +http://free.fullspeed.tv/iptv-query?streaming-ip=https://www.youtube.com/channel/UCZdBJIbJz0P9xyFipgOj1fA/live #EXTINF:-1 tvg-id="" status="online",Korea TV https://hlive.ktv.go.kr/live/klive_h.stream/playlist.m3u8 #EXTINF:-1 tvg-id="" status="online",KBS News @@ -168,6 +165,8 @@ http://live.kytv.co.kr:8080/hls/stream.m3u8 http://free.fullspeed.tv/iptv-query?streaming-ip=https://www.youtube.com/c/ALLTHEKPOP/live #EXTINF:-1 tvg-id="" status="error",가요TV (1080p) [Not 24/7] http://gayotv.net:1935/live/gayotv/playlist.m3u8 +#EXTINF:-1 tvg-id="KNNTV.kr",SBS KNN (1080p) +http://220.95.92.160:9981/stream/channelid/1445999617 #EXTINF:-1 tvg-id="",SBS (1080p) http://222.109.117.27:9981/stream/channelid/2096368258 #EXTINF:-1 tvg-id="",SBS TJB (1080p)