Merge tag 'upstream/0+git20160503.4f192bd'

Upstream version 0+git20160503.4f192bd

3 files changed, 64 insertions, 35 deletions

diff --git a/isdb-t/br-sc-Florianopolis b/isdb-t/br-sc-Florianopolis
index 5673cd0..62abf00 100644
--- a/isdb-t/br-sc-Florianopolis
+++ b/isdb-t/br-sc-Florianopolis
@@ -1,5 +1,5 @@
 # Channel table for Florianópolis - SC - Brazil
-# Source: http://portalbsd.com.br/novo/terrestres_channels.php?channels=185
+# Source: http://www.portalbsd.com.br/terrestres_channels.php?channels=185
 
 # Physical channel 21
 [Rede Vida]
@@ -59,6 +59,35 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 26
+[CNT]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 545142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
 # Physical channel 30
 [RIC SC]
 	DELIVERY_SYSTEM = ISDBT
@@ -233,8 +262,37 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
+# Physical channel 51
+[TVCI]
+	DELIVERY_SYSTEM = ISDBT
+	BANDWIDTH_HZ = 6000000
+	FREQUENCY = 695142857
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	INVERSION = AUTO
+	GUARD_INTERVAL = AUTO
+	TRANSMISSION_MODE = AUTO
+	ISDBT_LAYER_ENABLED = 7
+	ISDBT_SOUND_BROADCASTING = 0
+	ISDBT_SB_SUBCHANNEL_ID = 0
+	ISDBT_SB_SEGMENT_IDX = 0
+	ISDBT_SB_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_FEC = AUTO
+	ISDBT_LAYERA_MODULATION = QAM/AUTO
+	ISDBT_LAYERA_SEGMENT_COUNT = 0
+	ISDBT_LAYERA_TIME_INTERLEAVING = 0
+	ISDBT_LAYERB_FEC = AUTO
+	ISDBT_LAYERB_MODULATION = QAM/AUTO
+	ISDBT_LAYERB_SEGMENT_COUNT = 0
+	ISDBT_LAYERB_TIME_INTERLEAVING = 0
+	ISDBT_LAYERC_FEC = AUTO
+	ISDBT_LAYERC_MODULATION = QAM/AUTO
+	ISDBT_LAYERC_SEGMENT_COUNT = 0
+	ISDBT_LAYERC_TIME_INTERLEAVING = 0
+
 # Physical channel 61
-[TV Câmara, TV Senado, TV AL, TV Câmara Municipal]
+[TV Câmara, TV Senado, TV AL, TV Câmara Florianópolis]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
 	FREQUENCY = 755142857
diff --git a/isdb-t/br-sc-FlorianopolisCanasvieiras b/isdb-t/br-sc-FlorianopolisCanasvieiras
index 1a55f9e..1c8e8b3 100644
--- a/isdb-t/br-sc-FlorianopolisCanasvieiras
+++ b/isdb-t/br-sc-FlorianopolisCanasvieiras
@@ -1,5 +1,5 @@
 # Channel table for Florianópolis (Canasvieiras) - SC - Brazil
-# Source: http://portalbsd.com.br/novo/terrestres_channels.php?channels=1015
+# Source: http://www.portalbsd.com.br/terrestres_channels.php?channels=1015
 
 # Physical channel 21
 [Rede Vida]
@@ -117,35 +117,6 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 34
-[RBS SC]
-	DELIVERY_SYSTEM = ISDBT
-	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 593142857
-	INVERSION = AUTO
-	GUARD_INTERVAL = AUTO
-	TRANSMISSION_MODE = AUTO
-	INVERSION = AUTO
-	GUARD_INTERVAL = AUTO
-	TRANSMISSION_MODE = AUTO
-	ISDBT_LAYER_ENABLED = 7
-	ISDBT_SOUND_BROADCASTING = 0
-	ISDBT_SB_SUBCHANNEL_ID = 0
-	ISDBT_SB_SEGMENT_IDX = 0
-	ISDBT_SB_SEGMENT_COUNT = 0
-	ISDBT_LAYERA_FEC = AUTO
-	ISDBT_LAYERA_MODULATION = QAM/AUTO
-	ISDBT_LAYERA_SEGMENT_COUNT = 0
-	ISDBT_LAYERA_TIME_INTERLEAVING = 0
-	ISDBT_LAYERB_FEC = AUTO
-	ISDBT_LAYERB_MODULATION = QAM/AUTO
-	ISDBT_LAYERB_SEGMENT_COUNT = 0
-	ISDBT_LAYERB_TIME_INTERLEAVING = 0
-	ISDBT_LAYERC_FEC = AUTO
-	ISDBT_LAYERC_MODULATION = QAM/AUTO
-	ISDBT_LAYERC_SEGMENT_COUNT = 0
-	ISDBT_LAYERC_TIME_INTERLEAVING = 0
-
 # Physical channel 42
 [TV Aparecida]
 	DELIVERY_SYSTEM = ISDBT
diff --git a/isdb-t/br-sc-FlorianopolisIngleses b/isdb-t/br-sc-FlorianopolisIngleses
index 11e3740..b68c2b0 100644
--- a/isdb-t/br-sc-FlorianopolisIngleses
+++ b/isdb-t/br-sc-FlorianopolisIngleses
@@ -1,5 +1,5 @@
 # Channel table for Florianópolis (Ingleses) - SC - Brazil
-# Source: http://portalbsd.com.br/novo/terrestres_channels.php?channels=1016
+# Source: http://www.portalbsd.com.br/terrestres_channels.php?channels=1016
 
 # Physical channel 30
 [RIC SC]
@@ -30,11 +30,11 @@
 	ISDBT_LAYERC_SEGMENT_COUNT = 0
 	ISDBT_LAYERC_TIME_INTERLEAVING = 0
 
-# Physical channel 34
+# Physical channel 33
 [RBS SC]
 	DELIVERY_SYSTEM = ISDBT
 	BANDWIDTH_HZ = 6000000
-	FREQUENCY = 593142857
+	FREQUENCY = 587142857
 	INVERSION = AUTO
 	GUARD_INTERVAL = AUTO
 	TRANSMISSION_MODE = AUTO