diff options
Diffstat (limited to 'epan/dissectors/packet-h263p.c')
| -rw-r--r-- | epan/dissectors/packet-h263p.c | 48 |
1 files changed, 24 insertions, 24 deletions
diff --git a/epan/dissectors/packet-h263p.c b/epan/dissectors/packet-h263p.c index 64b0fa84..a06f3d58 100644 --- a/epan/dissectors/packet-h263p.c +++ b/epan/dissectors/packet-h263p.c @@ -26,28 +26,28 @@ void proto_reg_handoff_h263P(void); void proto_register_h263P(void); -static int proto_h263P = -1; +static int proto_h263P; /* H.263 RFC 4629 fields */ -static int hf_h263P_payload = -1; -static int hf_h263P_rr = -1; -static int hf_h263P_pbit = -1; -static int hf_h263P_vbit = -1; -static int hf_h263P_plen = -1; -static int hf_h263P_pebit = -1; -static int hf_h263P_tid = -1; -static int hf_h263P_trun = -1; -static int hf_h263P_s = -1; -static int hf_h263P_extra_hdr = -1; -/* static int hf_h263P_PSC = -1; */ -/* static int hf_h263P_TR = -1; */ +static int hf_h263P_payload; +static int hf_h263P_rr; +static int hf_h263P_pbit; +static int hf_h263P_vbit; +static int hf_h263P_plen; +static int hf_h263P_pebit; +static int hf_h263P_tid; +static int hf_h263P_trun; +static int hf_h263P_s; +static int hf_h263P_extra_hdr; +/* static int hf_h263P_PSC; */ +/* static int hf_h263P_TR; */ /* H.263-1998 fields defining a sub tree */ -static gint ett_h263P = -1; -static gint ett_h263P_extra_hdr = -1; -static gint ett_h263P_payload = -1; -static gint ett_h263P_data = -1; +static int ett_h263P; +static int ett_h263P_extra_hdr; +static int ett_h263P_payload; +static int ett_h263P_data; static dissector_handle_t h263P_handle; @@ -62,8 +62,8 @@ dissect_h263P( tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _ proto_tree *h263P_extr_hdr_tree = NULL; proto_tree *h263P_data_tree = NULL; unsigned int offset = 0; - guint16 data16, plen; - guint8 startcode; + uint16_t data16, plen; + uint8_t startcode; /* tvbuff_t *next_tvb; @@ -134,7 +134,7 @@ dissect_h263P( tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _ if (plen != 0){ extra_hdr_item = proto_tree_add_item( h263P_tree, hf_h263P_extra_hdr, tvb, offset, plen, ENC_NA ); h263P_extr_hdr_tree = proto_item_add_subtree( extra_hdr_item, ett_h263P_extra_hdr ); - dissect_h263_picture_layer( tvb, pinfo, h263P_extr_hdr_tree, offset, plen, TRUE); + dissect_h263_picture_layer( tvb, pinfo, h263P_extr_hdr_tree, offset, plen, true); offset += plen; } if ((data16&0x0400)!=0){ @@ -142,7 +142,7 @@ dissect_h263P( tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _ data_item = proto_tree_add_item( h263P_tree, hf_h263P_payload, tvb, offset, -1, ENC_NA ); h263P_data_tree = proto_item_add_subtree( data_item, ett_h263P_data ); /* Startc code holds bit 17 -23 of the codeword */ - startcode = tvb_get_guint8(tvb,offset)&0xfe; + startcode = tvb_get_uint8(tvb,offset)&0xfe; if (startcode & 0x80){ /* All picture, slice, and EOSBS start codes * shall be byte aligned, and GOB and EOS start codes may be byte aligned. @@ -160,7 +160,7 @@ dissect_h263P( tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _ * ( 1000 00x.) */ col_append_str( pinfo->cinfo, COL_INFO, "(PSC) "); - dissect_h263_picture_layer( tvb, pinfo, h263P_data_tree, offset, -1, TRUE); + dissect_h263_picture_layer( tvb, pinfo, h263P_data_tree, offset, -1, true); break; case 0xfc: case 0xfe: @@ -172,7 +172,7 @@ dissect_h263P( tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _ * Slice Start Code (SSC) */ col_append_str( pinfo->cinfo, COL_INFO, "(GBSC) "); - dissect_h263_group_of_blocks_layer( tvb, h263P_data_tree, offset,TRUE); + dissect_h263_group_of_blocks_layer( tvb, h263P_data_tree, offset,true); break; } }else{ @@ -354,7 +354,7 @@ proto_register_h263P(void) }; - static gint *ett[] = + static int *ett[] = { &ett_h263P, &ett_h263P_extra_hdr, |