mergecap: check input files time precision before exporting to pcapng format

Bug: 11202
Change-Id: I0891235e9fd41687a12eb8c7e05048e25de3d8b9
Reviewed-on: https://code.wireshark.org/review/9137
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Reviewed-by: Evan Huus <eapache@gmail.com>
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
Reviewed-by: Anders Broman <a.broman58@gmail.com>

1 files changed, 1 insertions, 1 deletions

diff --git a/file.c b/file.c
index 39f500448c..c13f4c6265 100644
--- a/file.c
+++ b/file.c
@@ -1345,7 +1345,7 @@ cf_merge_files(char **out_filenamep, int in_file_count,
         int_data.opt_comment           = NULL;
         int_data.if_description        = NULL;
         int_data.if_speed              = 0;
-        int_data.if_tsresol            = 6;
+        int_data.if_tsresol            = file_int_data->if_tsresol;
         int_data.if_filter_str         = NULL;
         int_data.bpf_filter_len        = 0;
         int_data.if_filter_bpf_bytes   = NULL;