diff options
| author | Guy Harris <guy@alum.mit.edu> | 2013-11-08 09:53:01 +0000 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2013-11-08 09:53:01 +0000 |
| commit | 853da2eb9ba1732b37d3f47319bc94471d9c0e16 (patch) | |
| tree | 94f8afdae71f496fe638550f9e2cea926195b8ee /wiretap/mpeg.c | |
| parent | 5cec175b071b85c7cd392350e2fcc246dc20d41d (diff) | |
The "file types" we have are actually combinations of types and
subtypes, e.g. Network Monitor version 1 and Network Monitor version 2
are separate "file types", even though they both come from Network
Monitor.
Rename various functions, #defines, and variables appropriately.
svn path=/trunk/; revision=53166
Diffstat (limited to 'wiretap/mpeg.c')
| -rw-r--r-- | wiretap/mpeg.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/wiretap/mpeg.c b/wiretap/mpeg.c index f8d1abc632..2f93292f44 100644 --- a/wiretap/mpeg.c +++ b/wiretap/mpeg.c @@ -268,7 +268,7 @@ good_magic: if (file_seek(wth->fh, 0, SEEK_SET, err) == -1) return -1; - wth->file_type = WTAP_FILE_MPEG; + wth->file_type_subtype = WTAP_FILE_TYPE_SUBTYPE_MPEG; wth->file_encap = WTAP_ENCAP_MPEG; wth->tsprecision = WTAP_FILE_TSPREC_NSEC; wth->subtype_read = mpeg_read; |