diff options
| author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-09-19 04:14:53 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-09-19 04:14:53 +0000 |
| commit | a86c5f7cae7ec9a3398300555a0b644689d946a1 (patch) | |
| tree | 39fe4b107c71174fd1e8a8ceb9a4d2aa14116248 /epan/dissectors/packet-rfc2190.c | |
| parent | Releasing progress-linux version 4.2.6-1~progress7.99u1. (diff) | |
| download | wireshark-a86c5f7cae7ec9a3398300555a0b644689d946a1.tar.xz wireshark-a86c5f7cae7ec9a3398300555a0b644689d946a1.zip | |
Merging upstream version 4.4.0.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'epan/dissectors/packet-rfc2190.c')
| -rw-r--r-- | epan/dissectors/packet-rfc2190.c | 62 |
1 files changed, 31 insertions, 31 deletions
diff --git a/epan/dissectors/packet-rfc2190.c b/epan/dissectors/packet-rfc2190.c index f0037962..d9eb01aa 100644 --- a/epan/dissectors/packet-rfc2190.c +++ b/epan/dissectors/packet-rfc2190.c @@ -33,38 +33,38 @@ void proto_register_rfc2190(void); void proto_reg_handoff_rfc2190(void); /* H.263 header fields */ -static int proto_rfc2190 = -1; +static int proto_rfc2190; /* Mode A header */ -static int hf_rfc2190_ftype = -1; -static int hf_rfc2190_pbframes = -1; -static int hf_rfc2190_sbit = -1; -static int hf_rfc2190_ebit = -1; -static int hf_rfc2190_srcformat = -1; -static int hf_rfc2190_picture_coding_type_modeA = -1; -static int hf_rfc2190_unrestricted_motion_vector_modeA = -1; -static int hf_rfc2190_syntax_based_arithmetic_modeA = -1; -static int hf_rfc2190_advanced_prediction_modeA = -1; -static int hf_rfc2190_r_modeA = -1; -static int hf_rfc2190_rr = -1; -static int hf_rfc2190_dbq = -1; -static int hf_rfc2190_trb = -1; -static int hf_rfc2190_tr = -1; +static int hf_rfc2190_ftype; +static int hf_rfc2190_pbframes; +static int hf_rfc2190_sbit; +static int hf_rfc2190_ebit; +static int hf_rfc2190_srcformat; +static int hf_rfc2190_picture_coding_type_modeA; +static int hf_rfc2190_unrestricted_motion_vector_modeA; +static int hf_rfc2190_syntax_based_arithmetic_modeA; +static int hf_rfc2190_advanced_prediction_modeA; +static int hf_rfc2190_r_modeA; +static int hf_rfc2190_rr; +static int hf_rfc2190_dbq; +static int hf_rfc2190_trb; +static int hf_rfc2190_tr; /* Additional fields for Mode B or C header */ -static int hf_rfc2190_picture_coding_type_modeB = -1; -static int hf_rfc2190_unrestricted_motion_vector_modeB = -1; -static int hf_rfc2190_syntax_based_arithmetic_modeB = -1; -static int hf_rfc2190_advanced_prediction_modeB = -1; -static int hf_rfc2190_r_modeB = -1; -static int hf_rfc2190_quant = -1; -static int hf_rfc2190_gobn = -1; -static int hf_rfc2190_mba = -1; -static int hf_rfc2190_hmv1 = -1; -static int hf_rfc2190_vmv1 = -1; -static int hf_rfc2190_hmv2 = -1; -static int hf_rfc2190_vmv2 = -1; - -static gint ett_rfc2190 = -1; +static int hf_rfc2190_picture_coding_type_modeB; +static int hf_rfc2190_unrestricted_motion_vector_modeB; +static int hf_rfc2190_syntax_based_arithmetic_modeB; +static int hf_rfc2190_advanced_prediction_modeB; +static int hf_rfc2190_r_modeB; +static int hf_rfc2190_quant; +static int hf_rfc2190_gobn; +static int hf_rfc2190_mba; +static int hf_rfc2190_hmv1; +static int hf_rfc2190_vmv1; +static int hf_rfc2190_hmv2; +static int hf_rfc2190_vmv2; + +static int ett_rfc2190; static dissector_handle_t h263_handle; static dissector_handle_t rfc2190_handle; @@ -79,7 +79,7 @@ dissect_rfc2190( tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data tvbuff_t *next_tvb; int hdr_len = 0; - rfc2190_version = (tvb_get_guint8( tvb, offset ) & 0xc0 ) >> 6; + rfc2190_version = (tvb_get_uint8( tvb, offset ) & 0xc0 ) >> 6; col_set_str(pinfo->cinfo, COL_PROTOCOL, "H.263 "); @@ -563,7 +563,7 @@ proto_register_rfc2190(void) }, }; - static gint *ett[] = { + static int *ett[] = { &ett_rfc2190, }; |