From a86c5f7cae7ec9a3398300555a0b644689d946a1 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Thu, 19 Sep 2024 06:14:53 +0200 Subject: Merging upstream version 4.4.0. Signed-off-by: Daniel Baumann --- epan/dissectors/packet-mpeg1.c | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) (limited to 'epan/dissectors/packet-mpeg1.c') diff --git a/epan/dissectors/packet-mpeg1.c b/epan/dissectors/packet-mpeg1.c index 2e90aa44..c7611a4b 100644 --- a/epan/dissectors/packet-mpeg1.c +++ b/epan/dissectors/packet-mpeg1.c @@ -30,28 +30,28 @@ static dissector_handle_t mpeg1_handle; /* MPEG1 header fields */ -static int proto_mpg = -1; +static int proto_mpg; -static int hf_rtp_mpg_mbz = -1; -static int hf_rtp_mpg_T = -1; -static int hf_rtp_mpg_tr = -1; -static int hf_rtp_mpg_an = -1; -static int hf_rtp_mpg_n = -1; -static int hf_rtp_mpg_s = -1; -static int hf_rtp_mpg_b = -1; -static int hf_rtp_mpg_e = -1; -static int hf_rtp_mpg_p = -1; +static int hf_rtp_mpg_mbz; +static int hf_rtp_mpg_T; +static int hf_rtp_mpg_tr; +static int hf_rtp_mpg_an; +static int hf_rtp_mpg_n; +static int hf_rtp_mpg_s; +static int hf_rtp_mpg_b; +static int hf_rtp_mpg_e; +static int hf_rtp_mpg_p; -static int hf_rtp_mpg_fbv = -1; -static int hf_rtp_mpg_bfc = -1; -static int hf_rtp_mpg_ffv = -1; -static int hf_rtp_mpg_ffc = -1; -static int hf_rtp_mpg_data = -1; +static int hf_rtp_mpg_fbv; +static int hf_rtp_mpg_bfc; +static int hf_rtp_mpg_ffv; +static int hf_rtp_mpg_ffc; +static int hf_rtp_mpg_data; /* MPEG-1 fields defining a sub tree */ -static gint ett_mpg = -1; +static int ett_mpg; static const value_string rtp_mpg_picture_types_vals[] = { @@ -302,7 +302,7 @@ proto_register_mpeg1(void) }; - static gint *ett[] = + static int *ett[] = { &ett_mpg, }; -- cgit v1.2.3