diff options
| author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-09-19 04:14:33 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-09-19 04:14:33 +0000 |
| commit | 9f153fbfec0fb9c9ce38e749a7c6f4a5e115d4e9 (patch) | |
| tree | 2784370cda9bbf2da9114d70f05399c0b229d28c /wiretap/mp4.c | |
| parent | Adding debian version 4.2.6-1. (diff) | |
| download | wireshark-9f153fbfec0fb9c9ce38e749a7c6f4a5e115d4e9.tar.xz wireshark-9f153fbfec0fb9c9ce38e749a7c6f4a5e115d4e9.zip | |
Merging upstream version 4.4.0.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'wiretap/mp4.c')
| -rw-r--r-- | wiretap/mp4.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/wiretap/mp4.c b/wiretap/mp4.c index 36a43a71..40b08cf1 100644 --- a/wiretap/mp4.c +++ b/wiretap/mp4.c @@ -14,16 +14,16 @@ #include "file_wrappers.h" #include "wtap-int.h" -static const guint8 mp4_magic[] = { 'f', 't', 'y', 'p' }; -static const guint8 mp4_magic_sidx[] = { 's', 'i', 'd', 'x' }; -static const guint8 mp4_magic_styp[] = { 's', 't', 'y', 'p' }; +static const uint8_t mp4_magic[] = { 'f', 't', 'y', 'p' }; +static const uint8_t mp4_magic_sidx[] = { 's', 'i', 'd', 'x' }; +static const uint8_t mp4_magic_styp[] = { 's', 't', 'y', 'p' }; static int mp4_file_type_subtype = -1; void register_mp4(void); wtap_open_return_val -mp4_open(wtap *wth, int *err, gchar **err_info) +mp4_open(wtap *wth, int *err, char **err_info) { char magic_buf[8]; int bytes_read; @@ -67,7 +67,7 @@ static const struct supported_block_type mp4_blocks_supported[] = { static const struct file_type_subtype_info mp4_info = { "MP4 media", "mp4", "mp4", NULL, - FALSE, BLOCKS_SUPPORTED(mp4_blocks_supported), + false, BLOCKS_SUPPORTED(mp4_blocks_supported), NULL, NULL, NULL }; |