[vlc-commits] Fix parsing for ATSC channels.conf format

[Devin Heitmueller]

vlc | branch: master | Devin Heitmueller <dheitmueller at kernellabs.com> | Thu Aug 18 12:22:32 2016 -0400| [9fa4da00a0a900bd9719253e75a8554b22d0535d] | committer: Jean-Baptiste Kempf

Fix parsing for ATSC channels.conf format

I don't know if there is some channels.conf variation that specified
"VSB_8" as the modulation, but the official dvb-apps scan/azap tool
has used "8VSB" for as long as I can remember (at least going back
to 2008).

Add support for the 8VSB modulation type so that playlists for
ATSC channels.conf work again, but leave in there the existing
"VSB_8" value since it doesn't hurt anything and there might be
some variant of the channels.conf format that I am unfamiliar with.

Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=9fa4da00a0a900bd9719253e75a8554b22d0535d
---

 modules/demux/playlist/dvb.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/demux/playlist/dvb.c b/modules/demux/playlist/dvb.c
index 5ee1f77..d5ef313 100644
--- a/modules/demux/playlist/dvb.c
+++ b/modules/demux/playlist/dvb.c
@@ -135,7 +135,7 @@ static const char *ParseModulation(const char *str)
          char dvb[9];
          char vlc[7];
      } tab[] = {
-         { "APSK_16", "16APSK" }, { "APSK_32", "32APSK" },
+         { "8VSB", "8VSB" }, { "APSK_16", "16APSK" }, { "APSK_32", "32APSK" },
          { "DQPSK", "DQPSK" }, { "PSK_8", "8PSK" }, { "QPSK", "QPSK" },
          { "QAM_128", "128QAM" }, { "QAM_16", "16QAM" },
          { "QAM_256", "256QAM" }, { "QAM_32", "32QAM" },