vlc/vlc-2.0 | branch: master | Rémi Denis-Courmont <[email protected]> | Tue Mar 27 22:27:47 2012 +0300| [b69404ae3352313dc183e2418fe094db2a6b1824] | committer: Rémi Denis-Courmont
channels.conf: update/fix parameters values (cherry picked from commit aa392c1ef5d2984ed92f4413954087f42c14549a) > http://git.videolan.org/gitweb.cgi/vlc/vlc-2.0.git/?a=commit;h=b69404ae3352313dc183e2418fe094db2a6b1824 --- modules/demux/playlist/dvb.c | 54 +++++++++++++++++++++--------------------- 1 files changed, 27 insertions(+), 27 deletions(-) diff --git a/modules/demux/playlist/dvb.c b/modules/demux/playlist/dvb.c index ebf778c..a014fb3 100644 --- a/modules/demux/playlist/dvb.c +++ b/modules/demux/playlist/dvb.c @@ -147,7 +147,7 @@ static const struct { { "INVERSION_OFF", "dvb-inversion=0" }, { "INVERSION_ON", "dvb-inversion=1" }, - { "INVERSION_AUTO", "dvb-inversion=2" }, + { "INVERSION_AUTO", "dvb-inversion=-1" }, { "BANDWIDTH_AUTO", "dvb-bandwidth=0" }, { "BANDWIDTH_6_MHZ", "dvb-bandwidth=6" }, @@ -155,38 +155,38 @@ static const struct { "BANDWIDTH_8_MHZ", "dvb-bandwidth=8" }, { "FEC_NONE", "dvb-fec=0" }, - { "FEC_1_2", "dvb-fec=1" }, - { "FEC_2_3", "dvb-fec=2" }, - { "FEC_3_4", "dvb-fec=3" }, - { "FEC_4_5", "dvb-fec=4" }, - { "FEC_5_6", "dvb-fec=5" }, - { "FEC_6_7", "dvb-fec=6" }, - { "FEC_7_8", "dvb-fec=7" }, - { "FEC_8_9", "dvb-fec=8" }, - { "FEC_AUTO", "dvb-fec=9" }, - - { "GUARD_INTERVAL_AUTO", "dvb-guard=0" }, - { "GUARD_INTERVAL_1_4", "dvb-guard=4" }, - { "GUARD_INTERVAL_1_8", "dvb-guard=8" }, - { "GUARD_INTERVAL_1_16", "dvb-guard=16" }, - { "GUARD_INTERVAL_1_32", "dvb-guard=32" }, + { "FEC_1_2", "dvb-fec=1/2" }, + { "FEC_2_3", "dvb-fec=2/3" }, + { "FEC_3_4", "dvb-fec=3/4" }, + { "FEC_4_5", "dvb-fec=4/5" }, + { "FEC_5_6", "dvb-fec=5/6" }, + { "FEC_6_7", "dvb-fec=6/7" }, + { "FEC_7_8", "dvb-fec=7/8" }, + { "FEC_8_9", "dvb-fec=8/9" }, + { "FEC_AUTO", "dvb-fec=" }, + + { "GUARD_INTERVAL_AUTO", "dvb-guard=" }, + { "GUARD_INTERVAL_1_4", "dvb-guard=1/4" }, + { "GUARD_INTERVAL_1_8", "dvb-guard=1/8" }, + { "GUARD_INTERVAL_1_16", "dvb-guard=1/16" }, + { "GUARD_INTERVAL_1_32", "dvb-guard=1/32" }, { "HIERARCHY_NONE", "dvb-hierarchy=-1" }, { "HIERARCHY_1", "dvb-hierarchy=1" }, { "HIERARCHY_2", "dvb-hierarchy=2" }, { "HIERARCHY_4", "dvb-hierarchy=4" }, - { "QPSK", "dvb-modulation=-1" }, - { "QAM_AUTO", "dvb-modulation=0" }, - { "QAM_16", "dvb-modulation=16" }, - { "QAM_32", "dvb-modulation=32" }, - { "QAM_64", "dvb-modulation=64" }, - { "QAM_128", "dvb-modulation=128" }, - { "QAM_256", "dvb-modulation=256" }, - { "8VSB", "dvb-modulation=8" }, - { "16VSB", "dvb-modulation=16" }, - - { "TRANSMISSION_MODE_AUTO", "dvb-transmission=0" }, + { "QPSK", "dvb-modulation=QPSK" }, + { "QAM_AUTO", "dvb-modulation=QAM" }, + { "QAM_16", "dvb-modulation=16QAM" }, + { "QAM_32", "dvb-modulation=32QAM" }, + { "QAM_64", "dvb-modulation=64QAM" }, + { "QAM_128", "dvb-modulation=128QAM" }, + { "QAM_256", "dvb-modulation=256QAM" }, + { "8VSB", "dvb-modulation=8VSB" }, + { "16VSB", "dvb-modulation=16VSB" }, + + { "TRANSMISSION_MODE_AUTO", "dvb-transmission=-1" }, { "TRANSMISSION_MODE_2K", "dvb-transmission=2" }, { "TRANSMISSION_MODE_8K", "dvb-transmission=8" }, { 0, 0 } _______________________________________________ vlc-commits mailing list [email protected] http://mailman.videolan.org/listinfo/vlc-commits
