From 5f14cec8e250d67b8c15becdbc9539a5f3aea40f Mon Sep 17 00:00:00 2001
From: Anders Broman <anders.broman@ericsson.com>
Date: Mon, 6 Feb 2012 19:15:07 +0000
Subject: [PATCH] From Guy Martin: Add new linktype 243 for MPEG2-TS.

https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6796

svn path=/trunk/; revision=40884
---
 wiretap/pcap-common.c | 2 ++
 wiretap/wtap.c        | 5 ++++-
 wiretap/wtap.h        | 1 +
 3 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/wiretap/pcap-common.c b/wiretap/pcap-common.c
index e0575c06a5..ed6915b287 100644
--- a/wiretap/pcap-common.c
+++ b/wiretap/pcap-common.c
@@ -378,6 +378,8 @@ static const struct {
 	{ 241,		WTAP_ENCAP_NETANALYZER_TRANSPARENT },
 	/* IP-over-Infiniband, as specified by RFC 4391 section 6 */
 	{ 242,		WTAP_ENCAP_IP_OVER_IB },
+	/* ISO/IEC 13818-1 MPEG2-TS packets */
+	{ 243,		WTAP_ENCAP_MPEG_2_TS },
 
 	/*
 	 * To repeat:
diff --git a/wiretap/wtap.c b/wiretap/wtap.c
index 530a573f86..c66dee30a0 100644
--- a/wiretap/wtap.c
+++ b/wiretap/wtap.c
@@ -515,7 +515,10 @@ static struct encap_type_info encap_table_base[] = {
 	{ "netANALYZER-Transparent", "netanalyzer-transparent" },
 
 	/* WTAP_ENCAP_IP_OVER_IB */
-	{ "IP over Infiniband", "ip-over-ib" }
+	{ "IP over Infiniband", "ip-over-ib" },
+
+	/* WTAP_ENCAP_MPEG_2_TS */
+	{ "ISO/IEC 13818-1 MPEG2-TS", "mp2ts" }
 };
 
 gint wtap_num_encap_types = sizeof(encap_table_base) / sizeof(struct encap_type_info);
diff --git a/wiretap/wtap.h b/wiretap/wtap.h
index f71416bc7e..1d002de72c 100644
--- a/wiretap/wtap.h
+++ b/wiretap/wtap.h
@@ -227,6 +227,7 @@ extern "C" {
 #define WTAP_ENCAP_NETANALYZER                  135
 #define WTAP_ENCAP_NETANALYZER_TRANSPARENT      136
 #define WTAP_ENCAP_IP_OVER_IB                   137
+#define WTAP_ENCAP_MPEG_2_TS			138
 
 #define WTAP_NUM_ENCAP_TYPES                    wtap_get_num_encap_types()