iptv-org/iptv
1
0
Fork 0
mirror of https://github.com/iptv-org/iptv synced 2026-04-30 06:37:05 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix conflict

Browse Source
This commit is contained in:
Omega
2021-06-27 23:47:41 +02:00
parent ad8ba27819 a5dbbbf6fa
commit 2b743c8a98
30 changed files with 22 additions and 174 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
channels/us.m3u
View File

@@ -9,8 +9,6 @@ https://dai.google.com/linear/hls/event/UXgY8vuCSgiAlXtckOHm6A/master.m3u8
https://content.uplynk.com/channel/ff809e6d9ec34109abfb333f0d4444b5.m3u8
#EXTINF:-1 tvg-id="24HourFreeMovies.us" tvg-name="24 Hour Free Movies" tvg-country="US" tvg-language="" tvg-logo="https://i.imgur.com/FiTdDp1.png" group-title="",24 Hour Free Movies
https://d15690s323oesy.cloudfront.net/v1/master/9d062541f2ff39b5c0f48b743c6411d25f62fc25/UDU-Plex/158.m3u8
#EXTINF:-1 tvg-id="24Kitchen.us" tvg-name="24 Kitchen" tvg-country="US" tvg-language="" tvg-logo="" group-title="",24 Kitchen
https://cdn1.mobiletv.bg/T3/24kitchen/24kitchen_794613_850k.m3u8
#EXTINF:-1 tvg-id="247RetroTV.us" tvg-name="247 Retro TV" tvg-country="US" tvg-language="" tvg-logo="https://raw.githubusercontent.com/geonsey/Free2ViewTV/master/images/logos/247RetroTV.png" group-title="",247 Retro TV
http://hlsdpi-cdn-chqtx02.totalstream.net/dpilive/247retro/ret/dai/playlist.m3u8
#EXTINF:-1 tvg-id="30ADarcizzleOffshore.us" tvg-name="30A Darcizzle Offshore" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/l2O0fY1.png" group-title="Outdoor",30A Darcizzle Offshore (720p)
@@ -255,8 +253,6 @@ https://amc-allweddings-1.plex.wurl.com/manifest/playlist.m3u8
https://amc-allweddings-1.samsung.wurl.com/manifest/playlist.m3u8
#EXTINF:-1 tvg-id="AmsTestKitchen.us" tvg-name="Am.'s Test Kitchen" tvg-country="US" tvg-language="" tvg-logo="https://od.lk/s/MF8yMzE5OTIyMjBf/Redbox_512x512.png" group-title="",Am.'s Test Kitchen
https://dai2.xumo.com/xumocdn/p=redbox&deviceid=&is_lat=&subp=RedboxdesktopWebWindows/amagi_hls_data_xumo1212A-redboxamericastestkitchen/CDN/playlist.m3u8
#EXTINF:-1 tvg-id="AMC.us" tvg-name="AMC" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/yngqRL8.png" group-title="Entertainment",AMC
https://cdn1.mobiletv.bg/T7/amc/amc_794613_850k.m3u8
#EXTINF:-1 tvg-id="AMCAbsoluteReality.us" tvg-name="AMC Absolute Reality" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/yngqRL8.png" group-title="Documentary",AMC Absolute Reality
https://amc-absolutereality-1.vizio.wurl.com/manifest/playlist.m3u8
#EXTINF:-1 tvg-id="AMCAllWeddings.us" tvg-name="AMC All Weddings" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/yngqRL8.png" group-title="Lifestyle",AMC All Weddings
@@ -390,8 +386,6 @@ https://livecdn.fptplay.net/qnetlive/babyfirst_hls.smil/chunklist_b2500000.m3u8
https://service-stitcher.clusters.pluto.tv/stitch/hls/channel/5ebac49ce4dc8b00078b23bc/master.m3u8?advertisingId=&appName=web&appVersion=5.14.0-0f5ca04c21649b8c8aad4e56266a23b96d73b83a&app_name=web&clientDeviceType=0&clientID=6fbead95-26b1-415d-998f-1bdef62d10be&clientModelNumber=na&deviceDNT=false&deviceId=6fbead95-26b1-415d-998f-1bdef62d10be&deviceLat=19.4358&deviceLon=-99.1441&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=88.0.4324.150&marketingRegion=VE&serverSideAds=false&sessionID=b8e5a857-714a-11eb-b532-0242ac110002&sid=b8e5a857-714a-11eb-b532-0242ac110002&userId=
#EXTINF:-1 tvg-id="Baeble.us" tvg-name="Baeble" tvg-country="US" tvg-language="" tvg-logo="https://od.lk/s/MF8yMzE5OTIyMjBf/Redbox_512x512.png" group-title="",Baeble
https://dai2.xumo.com/amagi_hls_data_xumo1212A-redboxbaeble/CDN/playlist.m3u8?p=redbox&deviceid=&is_lat=&subp=RedboxdesktopWebWindows
#EXTINF:-1 tvg-id="BaebleMusicXUMO.us" tvg-name="BaebleMusic (XUMO)" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/9kLTfsY.png" group-title="Music",BaebleMusic (XUMO)
https://dai1.xumo.com/bmneuerw7j9k5lfc/9999231/master.m3u8
#EXTINF:-1 tvg-id="Bambu.us" tvg-name="Bambu" tvg-country="US" tvg-language="" tvg-logo="https://github.com/geonsey/Free2ViewTV/blob/master/images/logos/Bambu_300x300.png?raw=true" group-title="",Bambu
https://bambu-junctionus.cinedigm.com/midroll/amagi_hls_data_xumo-host-bambu-junction/CDN/playlist.m3u8?webstream
#EXTINF:-1 tvg-id="BatteryPop.us" tvg-name="Battery Pop" tvg-country="US" tvg-language="" tvg-logo="https://od.lk/s/MF8yMzE5OTIyMjBf/Redbox_512x512.png" group-title="",Battery Pop
@@ -1381,8 +1375,6 @@ https://dovenow.wurl.com/manifest/playlist.m3u8
https://dovenow-tcl.amagi.tv/playlist.m3u8
#EXTINF:-1 tvg-id="DrGeneScott.us" tvg-name="Dr. Gene Scott" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/FppLahc.jpg" group-title="Religious",Dr. Gene Scott (480p)
https://wescottcchls-lh.akamaihd.net/i/wcc_wowlivehls@24607/master.m3u8
#EXTINF:-1 tvg-id="Drama.us" tvg-name="Drama" tvg-country="US" tvg-language="" tvg-logo="https://i.imgur.com/aonn9ln.png" group-title="",Drama
https://fb2bf1d1d7134ce3b02c27f2e2db706b.mediatailor.us-east-1.amazonaws.com/v1/master/82ded7a88773aef3d6dd1fedce15ba2d57eb6bca/wse_powr_com_5f89aecf39cfef1f2542d35d/playlist.m3u8
#EXTINF:-1 tvg-id="DramaLife.us" tvg-name="Drama Life" tvg-country="US" tvg-language="" tvg-logo="https://www.samsung.com/us/smg/content/dam/s7/home/televisions-and-home-theater/tvs/tvplus/all-channels/10062020/Drama_Life_190x190.png?raw=true" group-title="",Drama Life
http://service-stitcher.clusters.pluto.tv/v1/stitch/embed/hls/channel/5f24662bebe0f0000767de32/master.m3u8?deviceType=samsung-tvplus&deviceMake=samsung&deviceModel=samsung&deviceVersion=unknown&appVersion=unknown&deviceLat=0&deviceLon=0&deviceDNT=0&deviceId=91a6ae51-6f9d-4fbb-adb0-bdfffa44693e&deviceUA=samsung%2FSM-T720%2F10&advertisingId=91a6ae51-6f9d-4fbb-adb0-bdfffa44693e&us_privacy=1YNY&samsung_app_domain=https://play.google.com/store/apps/details?id=com.samsung.android.tvplus&samsung_app_name=Mobile%20TV%20Plus&profileLimit=&profileFloor=&embedPartner=samsung-tvplus
#EXTINF:-1 tvg-id="DREAMCORPLLC.us" tvg-name="DREAM CORP LLC (Adult Swim 24/7 Stream)" tvg-country="US" tvg-language="English" tvg-logo="" group-title="",DREAM CORP LLC (Adult Swim 24/7 Stream) [Geo-blocked]
@@ -2973,8 +2965,6 @@ https://ntv1.akamaized.net/hls/live/2014075/NASA-NTV1-HLS/master_2000.m3u8
https://liveanevia.mncnow.id/live/eds/NatGeoPeople/sa_dash_vmx/NatGeoPeople.mpd
#EXTINF:-1 tvg-id="NatGeoWild.us" tvg-name="Nat Geo Wild" tvg-country="US" tvg-language="" tvg-logo="https://static.epg.best/id/NatGeoWild.id.png" group-title="",Nat Geo Wild
https://liveanevia.mncnow.id/live/eds/NatGeoWild/sa_dash_vmx/NatGeoWild.mpd
#EXTINF:-1 tvg-id="NationalGeographic.us" tvg-name="National Geographic" tvg-country="US" tvg-language="" tvg-logo="" group-title="",National Geographic
https://cdn1.mobiletv.bg/T3/ng_hd/ng_hd_794613_850k.m3u8
#EXTINF:-1 tvg-id="NATIONALGEOGRAPHIC.us" tvg-name="NATIONAL GEOGRAPHIC" tvg-country="US" tvg-language="" tvg-logo="https://1000logos.net/wp-content/uploads/2017/04/Color-National-Geographic-Logo-500x250.jpg" group-title="",NATIONAL GEOGRAPHIC
https://livecdn.fptplay.net/foxlive/natgeohd_hls.smil/chunklist_b2500000.m3u8
#EXTINF:-1 tvg-id="NationalGeographicAbuDhabi.us" tvg-name="National Geographic Abu Dhabi" tvg-country="US" tvg-language="Arabic" tvg-logo="https://upload.wikimedia.org/wikipedia/commons/thumb/d/d2/Nat_geo_channel_abu_dhabi.png/220px-Nat_geo_channel_abu_dhabi.png" group-title="Documentary",National Geographic Abu Dhabi
@@ -3500,8 +3490,6 @@ https://playworksdigital-playworks-1-eu.rakuten.wurl.com/manifest/playlist.m3u8
https://playworksdigital-playworks-1.plex.wurl.com/manifest/playlist.m3u8
#EXTINF:-1 tvg-id="Playworks.us" tvg-name="Playworks" tvg-country="US" tvg-language="" tvg-logo="" group-title="",Playworks
https://playworksdigital-playworks-1.vizio.wurl.com/manifest/playlist.m3u8
#EXTINF:-1 tvg-id="PlutoBumblebee.us" tvg-name="Pluto (Bumblebee)" tvg-country="US" tvg-language="English" tvg-logo="https://imgix.unreel.me/https%3A%2F%2Fmedia.unreel.me%2Fprod%2Fbumblebeetv%2Flogo%2Fb1861978-d983-467b-a57d-6c108713950a?w=80&h=45&fit=fit&blur=0&ixlib=js-1.2.0&s=163aa34ed3d315580072ee3f7f7c6928" group-title="Kids",Pluto (Bumblebee)
https://5ab2d7093e38404091ca44d800f6c4c4.mediatailor.us-east-1.amazonaws.com/v1/master/82ded7a88773aef3d6dd1fedce15ba2d57eb6bca/wse_powr_com_5d42f01baea0c5699f368901/playlist.m3u8
#EXTINF:-1 tvg-id="PlutoCars.us" tvg-name="Pluto Cars" tvg-country="US" tvg-language="" tvg-logo="https://www.samsung.com/us/smg/content/dam/s7/home/televisions-and-home-theater/tvs/tv-plus/us-channel-lineup/PlutoTV_Cars_190x190.png?raw=true" group-title="",Pluto Cars
http://service-stitcher.clusters.pluto.tv/v1/stitch/embed/hls/channel/5c12ba66eae03059cbdc77f2/master.m3u8?deviceType=samsung-tvplus&deviceMake=samsung&deviceModel=samsung&deviceVersion=unknown&appVersion=unknown&deviceLat=0&deviceLon=0&deviceDNT=0&deviceId=91a6ae51-6f9d-4fbb-adb0-bdfffa44693e&deviceUA=samsung%2FSM-T720%2F10&advertisingId=91a6ae51-6f9d-4fbb-adb0-bdfffa44693e&us_privacy=1YNY&samsung_app_domain=https://play.google.com/store/apps/details?id=com.samsung.android.tvplus&samsung_app_name=Mobile%20TV%20Plus&profileLimit=&profileFloor=&embedPartner=samsung-tvplus
#EXTINF:-1 tvg-id="PlutoMundoRealSpain.us" tvg-name="Pluto Mundo Real (Spain)" tvg-country="US" tvg-language="" tvg-logo="" group-title="",Pluto Mundo Real (Spain)
@@ -4834,8 +4822,6 @@ https://service-stitcher.clusters.pluto.tv/stitch/hls/channel/5f2acdab16f5b30007
https://service-stitcher.clusters.pluto.tv/v1/stitch/embed/hls/channel/5f7790b3ed0c88000720b241/master.m3u8?deviceId=channel&deviceModel=web&deviceVersion=1.0&appVersion=1.0&deviceType=rokuChannel&deviceMake=rokuChannel&deviceDNT=1&advertisingId=channel&embedPartner=rokuChannel&appName=rokuchannel&is_lat=1&bmodel=bm1&content=channel&platform=web&tags=ROKU_CONTENT_TAGS&coppa=false&content_type=livefeed&rdid=channel&genre=ROKU_ADS_CONTENT_GENRE&content_rating=ROKU_ADS_CONTENT_RATING&studio_id=viacom&channel_id=channel
#EXTINF:-1 tvg-id="Pac12Insider.us" tvg-name="Pac-12 Insider" tvg-country="US" tvg-language="English" tvg-logo="http://images.pluto.tv/channels/5f84ce2ac265700008d48dcf/colorLogoPNG.png" group-title="",Pluto TV Pac-12 Insider (720p)
https://service-stitcher.clusters.pluto.tv/v1/stitch/embed/hls/channel/5f84ce2ac265700008d48dcf/master.m3u8?deviceId=channel&deviceModel=web&deviceVersion=1.0&appVersion=1.0&deviceType=rokuChannel&deviceMake=rokuChannel&deviceDNT=1&advertisingId=channel&embedPartner=rokuChannel&appName=rokuchannel&is_lat=1&bmodel=bm1&content=channel&platform=web&tags=ROKU_CONTENT_TAGS&coppa=false&content_type=livefeed&rdid=channel&genre=ROKU_ADS_CONTENT_GENRE&content_rating=ROKU_ADS_CONTENT_RATING&studio_id=viacom&channel_id=channel
#EXTINF:-1 tvg-id="PaisajesporStingray.us" tvg-name="Paisajes por Stingray" tvg-country="US" tvg-language="Spanish" tvg-logo="https://images.pluto.tv/channels/5f4fed840a2764000720d966/colorLogoPNG.png" group-title="",Pluto TV Paisajes por Stingray (720p)
https://service-stitcher.clusters.pluto.tv/stitch/hls/channel/5f4fed840a2764000720d966/master.m3u8?advertisingId=&appName=web&appVersion=5.14.0-0f5ca04c21649b8c8aad4e56266a23b96d73b83a&app_name=web&clientDeviceType=0&clientID=6fbead95-26b1-415d-998f-1bdef62d10be&clientModelNumber=na&deviceDNT=false&deviceId=6fbead95-26b1-415d-998f-1bdef62d10be&deviceLat=19.4358&deviceLon=-99.1441&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=88.0.4324.150&marketingRegion=VE&serverSideAds=false&sessionID=b8e5a857-714a-11eb-b532-0242ac110002&sid=b8e5a857-714a-11eb-b532-0242ac110002&userId=
#EXTINF:-1 tvg-id="PlutoTVParamountMovieChannel.us" tvg-name="Pluto TV Paramount Movie Channel" tvg-country="US" tvg-language="" tvg-logo="" group-title="",Pluto TV Paramount Movie Channel
https://service-stitcher.clusters.pluto.tv/stitch/hls/channel/5cb0cae7a461406ffe3f5213/master.m3u8?terminate=false&deviceType=web&deviceMake=web&deviceModel=web&sid=100&deviceId=5cb0cae7a461406ffe3f5213&deviceVersion=DNT&appVersion=DNT&deviceDNT=0&userId=&advertisingId=&deviceLat=&deviceLon=&app_name=&appName=web&buildVersion=&appStoreUrl=&architecture=&includeExtendedEvents=false&marketingRegion=US&serverSideAds=false
#EXTINF:-1 tvg-id="ParamountMovieChannel.us" tvg-name="Paramount Movie Channel" tvg-country="US" tvg-language="English" tvg-logo="http://images.pluto.tv/channels/5cb0cae7a461406ffe3f5213/colorLogoPNG.png" group-title="",Pluto TV Paramount Movie Channel
@@ -5650,8 +5636,6 @@ https://dai.google.com/linear/hls/event/RNiQYO3aTjOqTe8od1zlqA/master.m3u8
https://stadium-ringofhonor-1.sinclair.wurl.com/manifest/playlist.m3u8
#EXTINF:-1 tvg-id="RobotChicken.us" tvg-name="Robot Chicken (Adult Swim 24/7 Stream)" tvg-country="US" tvg-language="English" tvg-logo="" group-title="",Robot Chicken (Adult Swim 24/7 Stream) [Geo-blocked]
https://adultswim-vodlive.cdn.turner.com/live/robot-chicken/stream.m3u8
#EXTINF:-1 tvg-id="Romance.us" tvg-name="Romance" tvg-country="US" tvg-language="" tvg-logo="https://i.imgur.com/oo3Dre9.png" group-title="",Romance
https://cca515f696634820833689103bb04704.mediatailor.us-east-1.amazonaws.com/v1/master/82ded7a88773aef3d6dd1fedce15ba2d57eb6bca/wse_powr_com_5f89af26264e201f49eec999/playlist.m3u8
#EXTINF:-1 tvg-id="Romantique.us" tvg-name="Romantique" tvg-country="US" tvg-language="" tvg-logo="https://f9q4g5j6.ssl.hwcdn.net/604819fcb99c5b3ca1689cf2" group-title="",Romantique
https://linear-152.frequency.stream/dist/localnow/152/hls/master/playlist.m3u8
#EXTINF:-1 tvg-id="RoosterTeethTV.us" tvg-name="Rooster Teeth TV" tvg-country="US" tvg-language="" tvg-logo="https://i.imgur.com/3o9cG76.png" group-title="",Rooster Teeth TV
@@ -5704,8 +5688,6 @@ https://sonlife5-i.akamaihd.net/hls/live/584631/master.m3u8
https://sonlife7-i.akamaihd.net/hls/live/585011/ch7/master.m3u8
#EXTINF:-1 tvg-id="SBNGlobal.us" tvg-name="SBN Global" tvg-country="US" tvg-language="English" tvg-logo="" group-title="Religious",SBN Global
https://sonlife10-i.akamaihd.net/hls/live/585013/ch10/master.m3u8
#EXTINF:-1 tvg-id="SciFi.us" tvg-name="SciFi" tvg-country="US" tvg-language="" tvg-logo="https://i.imgur.com/aUVVsSq.png" group-title="",SciFi
https://7f6c646754a74e90b9afad0ed13b1e32.mediatailor.us-east-1.amazonaws.com/v1/master/82ded7a88773aef3d6dd1fedce15ba2d57eb6bca/wse_powr_com_5f89af5a39cfef1f2542d365/playlist.m3u8
#EXTINF:-1 tvg-id="Screamfest.us" tvg-name="Screamfest" tvg-country="US" tvg-language="English" tvg-logo="https://app.digitickets.co.uk/userfiles/companies/screamfestlogo.300x150.png" group-title="Movies",Screamfest (720p)
https://vcnleomarkstudios.teleosmedia.com/stream/leomarkstudios/screamfest/playlist.m3u8
#EXTINF:-1 tvg-id="Screendreams.us" tvg-name="Screendreams" tvg-country="US" tvg-language="" tvg-logo="" group-title="",Screendreams