aboutsummaryrefslogtreecommitdiffstats
path: root/epan/dissectors/packet-text-media.c
diff options
context:
space:
mode:
authorcmaynard <cmaynard@f5534014-38df-0310-8fa8-9805f1628bb7>2010-12-31 18:03:23 +0000
committercmaynard <cmaynard@f5534014-38df-0310-8fa8-9805f1628bb7>2010-12-31 18:03:23 +0000
commit83fe3acd11b72d9f3517e1e65a66a0ffade9fa54 (patch)
treed7b249da2a8034afc5e38387e425c634b6e694af /epan/dissectors/packet-text-media.c
parent5820dc9c5a0c64441bc7042835397201929315fe (diff)
From Jakub Zawadzki via bug 4753: New dissector: JSON, w/minor changes by me:
1) Add links to RFC 4627 and the json.org web site. 2) Comment out hf_json_member_key to keep tools/checkhf.pl happy. 3) Avoid duplicate (application/json) from being displayed in Info column. git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@35317 f5534014-38df-0310-8fa8-9805f1628bb7
Diffstat (limited to 'epan/dissectors/packet-text-media.c')
-rw-r--r--epan/dissectors/packet-text-media.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/epan/dissectors/packet-text-media.c b/epan/dissectors/packet-text-media.c
index 5e97288165..ba2248cc6d 100644
--- a/epan/dissectors/packet-text-media.c
+++ b/epan/dissectors/packet-text-media.c
@@ -157,8 +157,6 @@ proto_reg_handoff_text_lines(void)
dissector_add_string("media_type", "application/vnd.poc.refer-to", text_lines_handle);
dissector_add_string("media_type", "application/vnd.drm.message", text_lines_handle);
- dissector_add_string("media_type", "application/json", text_lines_handle); /* RFC 4627 */
-
dissector_add_string("media_type", "application/x-wms-logplaystats", text_lines_handle);
dissector_add_string("media_type", "application/x-rtsp-udp-packetpair", text_lines_handle);
}