diff options
| author | Chris Maynard <Christopher.Maynard@GTECH.COM> | 2010-12-31 18:03:23 +0000 |
|---|---|---|
| committer | Chris Maynard <Christopher.Maynard@GTECH.COM> | 2010-12-31 18:03:23 +0000 |
| commit | 2cd8459ddb9a42c8c93bd7db688a913a0ac038b2 (patch) | |
| tree | d7b249da2a8034afc5e38387e425c634b6e694af /epan/dissectors/packet-text-media.c | |
| parent | c16cdbb8d978a64c38293813f5d4d3b2ad650596 (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.
svn path=/trunk/; revision=35317
Diffstat (limited to 'epan/dissectors/packet-text-media.c')
| -rw-r--r-- | epan/dissectors/packet-text-media.c | 2 |
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); } |