diff options
| author | Stig Bjørlykke <stig@bjorlykke.org> | 2009-10-17 20:56:06 +0000 |
|---|---|---|
| committer | Stig Bjørlykke <stig@bjorlykke.org> | 2009-10-17 20:56:06 +0000 |
| commit | b7d116667f4368ef156737efaa7574f507d97923 (patch) | |
| tree | aa3d01aca80a37274de9b22f457c49a7ee598d74 /wiretap/wtap.c | |
| parent | 80424e5ced9f0359fe3f6049369b6251783d9e0d (diff) | |
| download | wireshark-b7d116667f4368ef156737efaa7574f507d97923.tar.gz wireshark-b7d116667f4368ef156737efaa7574f507d97923.tar.bz2 wireshark-b7d116667f4368ef156737efaa7574f507d97923.zip | |
From Marton Nemeth:
Add the ability to open JPEG/JFIF files directly.
From me:
Some code cleanup + add new file to cmake.
svn path=/trunk/; revision=30588
Diffstat (limited to 'wiretap/wtap.c')
| -rw-r--r-- | wiretap/wtap.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/wiretap/wtap.c b/wiretap/wtap.c index f968c5c3cf..1231c4b95a 100644 --- a/wiretap/wtap.c +++ b/wiretap/wtap.c @@ -451,7 +451,10 @@ static struct encap_type_info encap_table_base[] = { { "Fibre Channel FC-2", "fc2" }, /* WTAP_ENCAP_FIBRE_CHANNEL_FC2_WITH_FRAME_DELIMS */ - { "Fibre Channel FC-2 With Frame Delimiter", "fc2sof"} + { "Fibre Channel FC-2 With Frame Delimiter", "fc2sof"}, + + /* WTAP_ENCAP_JPEG_JFIF */ + { "JPEG/JFIF", "jfif" } }; |