Merge branch 'master' into LaneSh4d0w-patch-4

streams/de_samsung.m3u

@@ -1,5 +1,5 @@
 #EXTM3U
-#EXTINF:-1 tvg-id="CNNInternationalGermany.us" status="online",CNN International Germany (720p)
+#EXTINF:-1 tvg-id="CNNInternationalEurope.us" status="online",CNN International Germany (720p)
 https://cnn-cnninternational-1-de.samsung.wurl.com/manifest/playlist.m3u8
 #EXTINF:-1 tvg-id="DeluxeLoungeHD.de" status="error",Deluxe Lounge HD (720p) [Not 24/7]
 https://d46c0ebf9ef94053848fdd7b1f2f6b90.mediatailor.eu-central-1.amazonaws.com/v1/manifest/81bfcafb76f9c947b24574657a9ce7fe14ad75c0/live-prod/91fcad1e-54b1-4702-9ec1-22a379525281/0.m3u8

streams/ph.m3u

@@ -1,7 +1,7 @@
 #EXTM3U
 #EXTINF:-1 tvg-id="CCTN47.ph" status="online",CCTN 47 (1080p) [Not 24/7]
 http://122.55.252.134:8443/live/bba5b536faeacb9b56a3239f1ee8e3b3/1.m3u8
-#EXTINF:-1 tvg-id="CNNPhilippines.us" status="online",CNN Philippines
+#EXTINF:-1 tvg-id="CNNPhilippines.ph" status="online",CNN Philippines
 https://streaming.cnnphilippines.com/live/myStream/playlist.m3u8
 #EXTINF:-1 tvg-id="DepEdTV.ph" status="blocked",DepEd TV (480p) [Geo-blocked]
 https://d3cbe0gidjd4k2.cloudfront.net/channel_7/channel7/playlist.m3u8

streams/sd.m3u

@@ -1,9 +1,9 @@
 #EXTM3U
-#EXTINF:-1 tvg-id="AfricaTV1.sd",Africa TV 1
+#EXTINF:-1 tvg-id="AfricaTV1.ng",Africa TV 1
 http://africatv.live.net.sa:1935/live/africatv/playlist.m3u8
-#EXTINF:-1 tvg-id="AfricaTV2.sd",Africa TV 2
+#EXTINF:-1 tvg-id="AfricaTV2.ng",Africa TV 2
 http://africatv.live.net.sa:1935/live/africatv2/playlist.m3u8
-#EXTINF:-1 tvg-id="AfricaTV3.sd",Africa TV 3
+#EXTINF:-1 tvg-id="AfricaTV3.ng",Africa TV 3
 http://africatv.live.net.sa:1935/live/africatv3/playlist.m3u8
 #EXTINF:-1 tvg-id="AlAlamiya2.sd" status="timeout",Al Alamiya 2
 http://82.212.74.98:8000/live/7815.m3u8

streams/uk_samsung.m3u

@@ -5,7 +5,7 @@ https://beanostudios-beanotv-1-gb.samsung.wurl.com/manifest/playlist.m3u8
 https://bloomberg-bloombergtv-1-gb.samsung.wurl.com/manifest/playlist.m3u8
 #EXTINF:-1 tvg-id="ClubbingTV.uk" status="online",Clubbing TV (720p)
 https://clubbingtv-samsunguk.amagi.tv/playlist.m3u8
-#EXTINF:-1 tvg-id="CNNInternationalUK.us" status="online",CNN International UK (720p) [Not 24/7]
+#EXTINF:-1 tvg-id="CNNInternationalEurope.us" status="online",CNN International UK (720p) [Not 24/7]
 https://cnn-cnninternational-1-gb.samsung.wurl.com/manifest/playlist.m3u8
 #EXTINF:-1 tvg-id="ComedyChannel.uk" status="online",Comedy Channel (1080p)
 https://uksono1-samsunguk.amagi.tv/playlist.m3u8

streams/us.m3u

@@ -323,23 +323,23 @@ https://16live00.akamaized.net/CNBC/index.m3u8
 http://ott-cdn.ucom.am/s65/index.m3u8
 #EXTINF:-1 tvg-id="CNBCIndonesia.us" status="online",CNBC Indonesia (720p)
 https://live.cnbcindonesia.com/livecnbc/smil:cnbctv.smil/playlist.m3u8
-#EXTINF:-1 tvg-id="CNNBrasil.us" status="error",CNN Brasil (1080p) [Not 24/7]
+#EXTINF:-1 tvg-id="CNNBrasil.br" status="error",CNN Brasil (1080p) [Not 24/7]
 http://free.fullspeed.tv/iptv-query?streaming-ip=https://www.youtube.com/channel/UCvdwhh_fDyWccR42-rReZLw/live
-#EXTINF:-1 tvg-id="CNNChile.us" status="timeout",CNN Chile (720p)
+#EXTINF:-1 tvg-id="CNNChile.cl" status="timeout",CNN Chile (720p)
 https://unlimited1-cl-movistar.dps.live/cnn/cnn.smil/playlist.m3u8
 #EXTINF:-1 tvg-id="CNNenEspanol.us" status="timeout",CNN en Español
 http://209.91.213.10:8088/play/a014
-#EXTINF:-1 tvg-id="CNNTurk.us" status="timeout",CNN Türk (480p) [Not 24/7]
+#EXTINF:-1 tvg-id="CNNTurk.tr" status="timeout",CNN Türk (480p) [Not 24/7]
 http://163.172.39.215:25461/line/C4@!a3a1@!w72A/129
-#EXTINF:-1 tvg-id="CNNUSA.us" status="online",CNN USA (720p)
+#EXTINF:-1 tvg-id="CNNUS.us" status="online",CNN USA (720p)
 https://tve-live-lln.warnermediacdn.com/hls/live/586495/cnngo/cnn_slate/VIDEO_0_3564000.m3u8
-#EXTINF:-1 tvg-id="CNNUSA.us" status="online",CNN USA (480p)
+#EXTINF:-1 tvg-id="CNNUS.us" status="online",CNN USA (480p)
 https://tve-live-lln.warnermediacdn.com/hls/live/586495/cnngo/cnn_slate/VIDEO_2_1964000.m3u8
-#EXTINF:-1 tvg-id="CNNUSA.us" status="online",CNN USA (360p)
+#EXTINF:-1 tvg-id="CNNUS.us" status="online",CNN USA (360p)
 https://tve-live-lln.warnermediacdn.com/hls/live/586495/cnngo/cnn_slate/VIDEO_3_1464000.m3u8
-#EXTINF:-1 tvg-id="CNNUSA.us" status="online",CNN USA (360p)
+#EXTINF:-1 tvg-id="CNNUS.us" status="online",CNN USA (360p)
 https://tve-live-lln.warnermediacdn.com/hls/live/586495/cnngo/cnn_slate/VIDEO_4_1064000.m3u8
-#EXTINF:-1 tvg-id="CNNUSA.us" status="blocked",CNN USA (360p)
+#EXTINF:-1 tvg-id="CNNUS.us" status="blocked",CNN USA (360p)
 http://stream.tvtap.live:8081/live/us-cnn.stream/playlist.m3u8
 #EXTINF:-1 tvg-id="ComedyDynamics.us" status="online",Comedy Dynamics (1080p)
 https://comedydynamics-wurl.cinedigm.com/playlist.m3u8