aboutsummaryrefslogtreecommitdiffstats
path: root/wiretap/mp2t.c
diff options
context:
space:
mode:
authorGuy Harris <guy@alum.mit.edu>2013-11-08 09:53:01 +0000
committerGuy Harris <guy@alum.mit.edu>2013-11-08 09:53:01 +0000
commit853da2eb9ba1732b37d3f47319bc94471d9c0e16 (patch)
tree94f8afdae71f496fe638550f9e2cea926195b8ee /wiretap/mp2t.c
parent5cec175b071b85c7cd392350e2fcc246dc20d41d (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/mp2t.c')
-rw-r--r--wiretap/mp2t.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/wiretap/mp2t.c b/wiretap/mp2t.c
index 5aafab1459..345aae6b94 100644
--- a/wiretap/mp2t.c
+++ b/wiretap/mp2t.c
@@ -229,7 +229,7 @@ mp2t_open(wtap *wth, int *err, gchar **err_info)
return -1;
}
- wth->file_type = WTAP_FILE_MPEG_2_TS;
+ wth->file_type_subtype = WTAP_FILE_TYPE_SUBTYPE_MPEG_2_TS;
wth->file_encap = WTAP_ENCAP_MPEG_2_TS;
wth->tsprecision = WTAP_FILE_TSPREC_NSEC;
wth->subtype_read = mp2t_read;