Merge remote-tracking branch 'origin/pr/217'

This commit is contained in:
Adam Sutton 2013-01-09 17:34:27 +00:00
commit c93333a089

View file

@ -855,16 +855,27 @@ static struct strtab caidnametab[] = {
{ "Viaccess", 0x0500 },
{ "Irdeto", 0x0600 },
{ "Irdeto", 0x0602 },
{ "Irdeto", 0x0604 },
{ "Irdeto", 0x0603 },
{ "Irdeto", 0x0604 },
{ "Irdeto", 0x0622 },
{ "Irdeto", 0x0624 },
{ "Irdeto", 0x0648 },
{ "Irdeto", 0x0666 },
{ "Jerroldgi", 0x0700 },
{ "Matra", 0x0800 },
{ "NDS", 0x0900 },
{ "NDS", 0x0919 },
{ "NDS", 0x091F },
{ "NDS", 0x092B },
{ "NDS", 0x09AF },
{ "NDS", 0x09C4 },
{ "NDS", 0x0960 },
{ "NDS", 0x0963 },
{ "Nokia", 0x0A00 },
{ "Conax", 0x0B00 },
{ "Conax", 0x0B00 },
{ "Conax", 0x0B01 },
{ "Conax", 0x0B02 },
{ "Conax", 0x0BAA },
{ "NTL", 0x0C00 },
{ "CryptoWorks", 0x0D00 },
{ "CryptoWorks", 0x0D01 },
@ -873,6 +884,7 @@ static struct strtab caidnametab[] = {
{ "CryptoWorks", 0x0D05 },
{ "CryptoWorks", 0x0D0F },
{ "CryptoWorks", 0x0D70 },
{ "CryptoWorks ICE", 0x0D95 },
{ "CryptoWorks ICE", 0x0D96 },
{ "CryptoWorks ICE", 0x0D97 },
{ "PowerVu", 0x0E00 },
@ -889,7 +901,16 @@ static struct strtab caidnametab[] = {
{ "BetaCrypt", 0x1702 },
{ "BetaCrypt", 0x1722 },
{ "BetaCrypt", 0x1762 },
{ "NagraVision", 0x1800 },
{ "NagraVision", 0x1800 },
{ "NagraVision", 0x1803 },
{ "Nagra Media Access", 0x1813 },
{ "NagraVision", 0x1810 },
{ "NagraVision", 0x1815 },
{ "NagraVision", 0x1830 },
{ "NagraVision", 0x1833 },
{ "NagraVision", 0x1834 },
{ "NagraVision", 0x183D },
{ "NagraVision", 0x1861 },
{ "Titan", 0x1900 },
{ "Telefonica", 0x2000 },
{ "Stentor", 0x2100 },