You signed in with another tab or window. Reload to refresh your session.You signed out in another tab or window. Reload to refresh your session.You switched accounts on another tab or window. Reload to refresh your session.Dismiss alert
Merges the changes from upstream repository at:
https://git.linuxtv.org/dtv-scan-tables
In case of conflicts, the most recent changed file was used. In all
but two cases, this means using the version from upstream.
Conflicts:
dvb-s/Astra-19.2E
- replaced by Astra-1{KR,L,M,N}-19.2E
dvb-s/Astra-28.2E
- replaced by Astra-2{E,F,G}-28.2E
dvb-s/PalapaC2_C-113.0E
- Satellite was decommissioned
dvb-s/Turksat-42.0E
- Replaced by Trksat-{3,4}A-42.0E
dvb-t/de-All
dvb-t/ru-Perm
- TVHeadend version used
dvb-t/es-Huelva
dvb-t/ru-Perm
dvb-t/uk-Bilsdale
dvb-t/uk-BluebellHill
dvb-t/uk-Heathfield
dvb-t/uk-Mendip
dvb-t/uk-Oxford
dvb-t/uk-Rowridge
dvb-t/uk-SandyHeath
dvb-t/uk-Sudbury
dvb-t/uk-TunbridgeWells
- Upstream version used
125 files modified only in TVHeadend.
3113 files modified only in upstream.
Fixestvheadend#139Fixestvheadend#132Fixestvheadend#118Fixestvheadend#109Fixestvheadend#82Fixestvheadend#78
Also obsoletes the following PRs - changes were already applied upstream:
Closestvheadend#150Closestvheadend#149Closestvheadend#148Closestvheadend#143Closestvheadend#142
These are the correct mux's
[C23 BBC A]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 490000000
BANDWIDTH_HZ = 8000000
CODE_RATE_HP = 2/3
CODE_RATE_LP = NONE
MODULATION = QAM/64
TRANSMISSION_MODE = 8K
GUARD_INTERVAL = 1/32
HIERARCHY = NONE
INVERSION = AUTO
[C26 D3&4]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 514000000
BANDWIDTH_HZ = 8000000
CODE_RATE_HP = 2/3
CODE_RATE_LP = NONE
MODULATION = QAM/64
TRANSMISSION_MODE = 8K
GUARD_INTERVAL = 1/32
HIERARCHY = NONE
INVERSION = AUTO
[C29 BBC B HD]
DELIVERY_SYSTEM = DVBT2
FREQUENCY = 538000000
BANDWIDTH_HZ = 8000000
CODE_RATE_HP = 2/3
CODE_RATE_LP = NONE
MODULATION = QAM/256
TRANSMISSION_MODE = 32K
GUARD_INTERVAL = 1/128
HIERARCHY = NONE
STREAM_ID = 0
INVERSION = AUTO
[C33 SDN]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 570000000
BANDWIDTH_HZ = 8000000
CODE_RATE_HP = 3/4
CODE_RATE_LP = NONE
MODULATION = QAM/64
TRANSMISSION_MODE = 8K
GUARD_INTERVAL = 1/32
HIERARCHY = NONE
INVERSION = AUTO
[C36 ARQ A]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 594000000
BANDWIDTH_HZ = 8000000
CODE_RATE_HP = 3/4
CODE_RATE_LP = NONE
MODULATION = QAM/64
TRANSMISSION_MODE = 8K
GUARD_INTERVAL = 1/32
HIERARCHY = NONE
INVERSION = AUTO
[C48 ARQ B]
DELIVERY_SYSTEM = DVBT
FREQUENCY = 690000000
BANDWIDTH_HZ = 8000000
CODE_RATE_HP = 3/4
CODE_RATE_LP = NONE
MODULATION = QAM/64
TRANSMISSION_MODE = 8K
GUARD_INTERVAL = 1/32
HIERARCHY = NONE
INVERSION = AUTO
The text was updated successfully, but these errors were encountered: