aboutsummaryrefslogtreecommitdiffstats
path: root/wiretap/mpeg.c
diff options
context:
space:
mode:
authorJeff Morriss <jeff.morriss@ulticom.com>2008-07-09 19:15:50 +0000
committerJeff Morriss <jeff.morriss@ulticom.com>2008-07-09 19:15:50 +0000
commit74c02268d88dfa86924bbd86107132aaeccce789 (patch)
treec81fcde9a126db3eb28892e2d36c2e957af8ec7a /wiretap/mpeg.c
parent0f199f4bffcbb410885205bc4e4577faf81f6ee2 (diff)
Add MP3 to the list of magic types
svn path=/trunk/; revision=25690
Diffstat (limited to 'wiretap/mpeg.c')
-rw-r--r--wiretap/mpeg.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/wiretap/mpeg.c b/wiretap/mpeg.c
index fd0c7f8fe2..fcecacea18 100644
--- a/wiretap/mpeg.c
+++ b/wiretap/mpeg.c
@@ -255,7 +255,7 @@ struct _mpeg_magic {
{ 3, "TAG" }, /* ID3v1 */
{ 3, "ID3" }, /* ID3v2 */
{ 3, "\0\0\1" }, /* MPEG PES */
- /* XXX MPEG audio is missing. */
+ { 2, "\xff\xfb" }, /* MP3, taken from http://en.wikipedia.org/wiki/MP3#File_structure */
{ 0, NULL }
};
@@ -275,8 +275,8 @@ mpeg_open(wtap *wth, int *err, gchar **err_info _U_)
return 0;
}
- for (m=magic;m->match;m++) {
- if (memcmp(magic_buf,m->match,m->len) == 0)
+ for (m=magic; m->match; m++) {
+ if (memcmp(magic_buf, m->match, m->len) == 0)
goto good_magic;
}