diff options
| author | Guy Harris <guy@alum.mit.edu> | 2020-01-20 23:54:29 -0800 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2020-01-21 20:54:25 +0000 |
| commit | fc314462773fd8086a7830b3effe4e3182e33b81 (patch) | |
| tree | 664510b305ad8b04d31fe0d76ea074f563c4441b /epan/proto.h | |
| parent | 23b91bdcd0c7282491eb13abe0b0365859fc16a7 (diff) | |
Add support for "classic Mac OS" timestamps and use them in file-mp4.c.
Those times are in seconds since January 1, 1904, 00:00:00 (proleptic?)
UTC.
MPEG-4 Part 14 (MP4) is based on QuickTime, so it uses classic Mac OS
time stamps, in seconds.
Change-Id: Ibcd7faf1b119d8acbb294c95b66ca0d1fb70cbb3
Reviewed-on: https://code.wireshark.org/review/35886
Petri-Dish: Guy Harris <guy@alum.mit.edu>
Tested-by: Petri Dish Buildbot
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Diffstat (limited to 'epan/proto.h')
| -rw-r--r-- | epan/proto.h | 29 |
1 files changed, 15 insertions, 14 deletions
diff --git a/epan/proto.h b/epan/proto.h index 510b4d4dd4..301d972971 100644 --- a/epan/proto.h +++ b/epan/proto.h @@ -400,20 +400,21 @@ void proto_report_dissector_bug(const char *format, ...) * the script to generate init.lua will add them as global variables, * along with the new names. */ -#define ENC_TIME_SECS_NSECS 0x00000000 -#define ENC_TIME_TIMESPEC 0x00000000 /* for backwards source compatibility */ -#define ENC_TIME_NTP 0x00000002 -#define ENC_TIME_TOD 0x00000004 -#define ENC_TIME_RTPS 0x00000008 -#define ENC_TIME_NTP_BASE_ZERO 0x00000008 /* for backwards source compatibility */ -#define ENC_TIME_SECS_USECS 0x00000010 -#define ENC_TIME_TIMEVAL 0x00000010 /* for backwards source compatibility */ -#define ENC_TIME_SECS 0x00000012 -#define ENC_TIME_MSECS 0x00000014 -#define ENC_TIME_SECS_NTP 0x00000018 -#define ENC_TIME_RFC_3971 0x00000020 -#define ENC_TIME_MSEC_NTP 0x00000022 -#define ENC_TIME_MIP6 0x00000024 +#define ENC_TIME_SECS_NSECS 0x00000000 +#define ENC_TIME_TIMESPEC 0x00000000 /* for backwards source compatibility */ +#define ENC_TIME_NTP 0x00000002 +#define ENC_TIME_TOD 0x00000004 +#define ENC_TIME_RTPS 0x00000008 +#define ENC_TIME_NTP_BASE_ZERO 0x00000008 /* for backwards source compatibility */ +#define ENC_TIME_SECS_USECS 0x00000010 +#define ENC_TIME_TIMEVAL 0x00000010 /* for backwards source compatibility */ +#define ENC_TIME_SECS 0x00000012 +#define ENC_TIME_MSECS 0x00000014 +#define ENC_TIME_SECS_NTP 0x00000018 +#define ENC_TIME_RFC_3971 0x00000020 +#define ENC_TIME_MSEC_NTP 0x00000022 +#define ENC_TIME_MIP6 0x00000024 +#define ENC_TIME_CLASSIC_MAC_OS_SECS 0x00000026 /* * This is a modifier for FT_UINT_STRING and FT_UINT_BYTES values; |