Merge branch 'master' into dvbsi++

Conflicts:
	src/zapit/include/zapit/zapit.h


Origin commit data
------------------
Commit: 86dbdde70d
Author: [CST] Bas <bas@coolstreamtech.com>
Date: 2012-04-12 (Thu, 12 Apr 2012)
This commit is contained in:
[CST] Bas
2012-04-13 04:55:55 +08:00
17 changed files with 156 additions and 27 deletions

View File

@@ -1604,7 +1604,7 @@
<transponder frequency="11953000" symbol_rate="27500000" polarization="0" fec_inner="3" system="0" modulation="1"/>
<transponder frequency="11973000" symbol_rate="27500000" polarization="1" fec_inner="3" system="0" modulation="1"/>
<transponder frequency="11992000" symbol_rate="27500000" polarization="0" fec_inner="9" system="1" modulation="1"/>
<transponder frequency="12012000" symbol_rate="27500000" polarization="1" fec_inner="2" system="1" modulation="2"/>
<transponder frequency="12012000" symbol_rate="29700000" polarization="1" fec_inner="2" system="1" modulation="2"/>
<transponder frequency="12031000" symbol_rate="27500000" polarization="0" fec_inner="3" system="0" modulation="1"/>
<transponder frequency="12051000" symbol_rate="27500000" polarization="1" fec_inner="3" system="0" modulation="1"/>
<transponder frequency="12070000" symbol_rate="27500000" polarization="0" fec_inner="3" system="0" modulation="1"/>