Merge tag 'upstream/0+git20141009.d26b627'

Upstream version 0+git20141009.d26b627

1 files changed, 232 insertions, 29 deletions

diff --git a/dvb-s/Insat4A_C-83.0E b/dvb-s/Insat4A_C-83.0E
index fa27210..8e1e903 100644
--- a/dvb-s/Insat4A_C-83.0E
+++ b/dvb-s/Insat4A_C-83.0E
@@ -6,88 +6,291 @@
 # freq pol sr fec
 
 # NSTPL Multiplex
-S 3725000 H 26665000 3/4
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS
+	FREQUENCY = 3725000
+	POLARIZATION = HORIZONTAL
+	SYMBOL_RATE = 26665000
+	INNER_FEC = 3/4
+	INVERSION = AUTO
+
 
 # Indiasign multiplex
-S 3756000 H 13333000 3/4
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS
+	FREQUENCY = 3756000
+	POLARIZATION = HORIZONTAL
+	SYMBOL_RATE = 13333000
+	INNER_FEC = 3/4
+	INVERSION = AUTO
+
 
 # Star TV Multiplex
-S 3777000 H 10900000 3/4
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS
+	FREQUENCY = 3777000
+	POLARIZATION = HORIZONTAL
+	SYMBOL_RATE = 10900000
+	INNER_FEC = 3/4
+	INVERSION = AUTO
+
 
 # Essel Shyam Multiplex
-S 3805000 H 28500000 7/8
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS
+	FREQUENCY = 3805000
+	POLARIZATION = HORIZONTAL
+	SYMBOL_RATE = 28500000
+	INNER_FEC = 7/8
+	INVERSION = AUTO
+
 
 # Tarang TV Multiplex (MPEG-4 S/2)
-S 3841000 H 6920000 3/4
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS
+	FREQUENCY = 3841000
+	POLARIZATION = HORIZONTAL
+	SYMBOL_RATE = 6920000
+	INNER_FEC = 3/4
+	INVERSION = AUTO
+
 
 # CTVN AKD Plus
-S 3853000 H 3265000 3/4
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS
+	FREQUENCY = 3853000
+	POLARIZATION = HORIZONTAL
+	SYMBOL_RATE = 3265000
+	INNER_FEC = 3/4
+	INVERSION = AUTO
+
 
 # Kasthuri TV
-S 3857000 H 3462000 3/4
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS
+	FREQUENCY = 3857000
+	POLARIZATION = HORIZONTAL
+	SYMBOL_RATE = 3462000
+	INNER_FEC = 3/4
+	INVERSION = AUTO
+
 
 # Kamyab TV
-S 3874000 H 3403000 3/4
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS
+	FREQUENCY = 3874000
+	POLARIZATION = HORIZONTAL
+	SYMBOL_RATE = 3403000
+	INNER_FEC = 3/4
+	INVERSION = AUTO
+
 
 # Vanitha TV
-S 3892000 H 3300000 3/4
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS
+	FREQUENCY = 3892000
+	POLARIZATION = HORIZONTAL
+	SYMBOL_RATE = 3300000
+	INNER_FEC = 3/4
+	INVERSION = AUTO
+
 
 # Essel Shayam Multiplex
-S 3898000 H 6800000 3/4
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS
+	FREQUENCY = 3898000
+	POLARIZATION = HORIZONTAL
+	SYMBOL_RATE = 6800000
+	INNER_FEC = 3/4
+	INVERSION = AUTO
+
 
 # Channel 10 India
-S 3910000 H 3600000 7/8
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS
+	FREQUENCY = 3910000
+	POLARIZATION = HORIZONTAL
+	SYMBOL_RATE = 3600000
+	INNER_FEC = 7/8
+	INVERSION = AUTO
+
 
 # Essel Shyam
-S 3923000 H 13000000 3/4
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS
+	FREQUENCY = 3923000
+	POLARIZATION = HORIZONTAL
+	SYMBOL_RATE = 13000000
+	INNER_FEC = 3/4
+	INVERSION = AUTO
+
 
 # DY 365
-S 3949000 H 3225000 3/4
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS
+	FREQUENCY = 3949000
+	POLARIZATION = HORIZONTAL
+	SYMBOL_RATE = 3225000
+	INNER_FEC = 3/4
+	INVERSION = AUTO
+
 
 # Multiplex
-S 3958000 H 9500000 7/8
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS
+	FREQUENCY = 3958000
+	POLARIZATION = HORIZONTAL
+	SYMBOL_RATE = 9500000
+	INNER_FEC = 7/8
+	INVERSION = AUTO
+
 
 # Zee News Uttar Pradesh
-S 3976000 H 3200000 3/4
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS
+	FREQUENCY = 3976000
+	POLARIZATION = HORIZONTAL
+	SYMBOL_RATE = 3200000
+	INNER_FEC = 3/4
+	INVERSION = AUTO
+
 
 # ETV Network Multiplex
-S 4004000 H 22220000 5/6
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS
+	FREQUENCY = 4004000
+	POLARIZATION = HORIZONTAL
+	SYMBOL_RATE = 22220000
+	INNER_FEC = 5/6
+	INVERSION = AUTO
+
 
 # Essel Shyam
-S 4040000 H 7500000 7/8
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS
+	FREQUENCY = 4040000
+	POLARIZATION = HORIZONTAL
+	SYMBOL_RATE = 7500000
+	INNER_FEC = 7/8
+	INVERSION = AUTO
+
 
 # Lamhas Multiplex
-S 4054000 H 13230000 3/4
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS
+	FREQUENCY = 4054000
+	POLARIZATION = HORIZONTAL
+	SYMBOL_RATE = 13230000
+	INNER_FEC = 3/4
+	INVERSION = AUTO
+
 
 # Network 18 Multiplex
-S 4072000 H 6500000 3/4
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS
+	FREQUENCY = 4072000
+	POLARIZATION = HORIZONTAL
+	SYMBOL_RATE = 6500000
+	INNER_FEC = 3/4
+	INVERSION = AUTO
+
 
 # IBN Lokmat
-S 4078000 H 3250000 3/4
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS
+	FREQUENCY = 4078000
+	POLARIZATION = HORIZONTAL
+	SYMBOL_RATE = 3250000
+	INNER_FEC = 3/4
+	INVERSION = AUTO
+
 
 # Live India
-S 4087000 H 3300000 3/4
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS
+	FREQUENCY = 4087000
+	POLARIZATION = HORIZONTAL
+	SYMBOL_RATE = 3300000
+	INNER_FEC = 3/4
+	INVERSION = AUTO
+
 
 # Mi Marathi
-S 4091000 H 3000000 3/4
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS
+	FREQUENCY = 4091000
+	POLARIZATION = HORIZONTAL
+	SYMBOL_RATE = 3000000
+	INNER_FEC = 3/4
+	INVERSION = AUTO
+
 
 # BBS TV
-S 4100000 H 4750000 3/4
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS
+	FREQUENCY = 4100000
+	POLARIZATION = HORIZONTAL
+	SYMBOL_RATE = 4750000
+	INNER_FEC = 3/4
+	INVERSION = AUTO
+
 
 # Manorama News
-S 4115000 H 5555000 3/4
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS
+	FREQUENCY = 4115000
+	POLARIZATION = HORIZONTAL
+	SYMBOL_RATE = 5555000
+	INNER_FEC = 3/4
+	INVERSION = AUTO
+
 
 # BAG Films
-S 4134000 H 10600000 3/4
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS
+	FREQUENCY = 4134000
+	POLARIZATION = HORIZONTAL
+	SYMBOL_RATE = 10600000
+	INNER_FEC = 3/4
+	INVERSION = AUTO
+
 
 # Zee Network Multiplex
-S 4151000 H 6500000 3/4
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS
+	FREQUENCY = 4151000
+	POLARIZATION = HORIZONTAL
+	SYMBOL_RATE = 6500000
+	INNER_FEC = 3/4
+	INVERSION = AUTO
+
 
 # Zee Network Multiplex
-S 4161000 H 6500000 3/4
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS
+	FREQUENCY = 4161000
+	POLARIZATION = HORIZONTAL
+	SYMBOL_RATE = 6500000
+	INNER_FEC = 3/4
+	INVERSION = AUTO
+
 
 # Lok Sabha TV
-S 4170000 H 6500000 3/4
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS
+	FREQUENCY = 4170000
+	POLARIZATION = HORIZONTAL
+	SYMBOL_RATE = 6500000
+	INNER_FEC = 3/4
+	INVERSION = AUTO
+
 
 # Kolkata TV
-S 4180000 H 3233000 3/4
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS
+	FREQUENCY = 4180000
+	POLARIZATION = HORIZONTAL
+	SYMBOL_RATE = 3233000
+	INNER_FEC = 3/4
+	INVERSION = AUTO
+