aboutsummaryrefslogtreecommitdiffstats
path: root/epan/dissectors/packet-jpeg.c
diff options
context:
space:
mode:
authorStig Bjørlykke <stig@bjorlykke.org>2012-11-12 22:00:53 +0000
committerStig Bjørlykke <stig@bjorlykke.org>2012-11-12 22:00:53 +0000
commitf267dda0d5e95475049ee9aba554e5007570ad23 (patch)
treec4d576bf4fae638d34e721161822ed20f775f150 /epan/dissectors/packet-jpeg.c
parent4e96e6c4753bf4cf286bcce82c2fa8f097dbef09 (diff)
Added attributes from RFC 2798.
svn path=/trunk/; revision=46013
Diffstat (limited to 'epan/dissectors/packet-jpeg.c')
-rw-r--r--epan/dissectors/packet-jpeg.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/epan/dissectors/packet-jpeg.c b/epan/dissectors/packet-jpeg.c
index 9d48919d86..fbd6b6097c 100644
--- a/epan/dissectors/packet-jpeg.c
+++ b/epan/dissectors/packet-jpeg.c
@@ -268,6 +268,9 @@ proto_register_jpeg(void)
proto_jpeg = proto_register_protocol("RFC 2435 JPEG","JPEG","jpeg");
proto_register_field_array(proto_jpeg, hf, array_length(hf));
proto_register_subtree_array(ett, array_length(ett));
+
+ /* RFC 2798 */
+ register_ber_oid_dissector("0.9.2342.19200300.100.1.60", dissect_jpeg, proto_jpeg, "jpegPhoto");
}
void