diff options
author | Bill Meier <wmeier@newsguy.com> | 2011-10-05 02:39:04 +0000 |
---|---|---|
committer | Bill Meier <wmeier@newsguy.com> | 2011-10-05 02:39:04 +0000 |
commit | e18e2694c6b5529fc65ca06103e043540ca70595 (patch) | |
tree | e4f78b75756a41bad98dbf20d863f3d60ee1b6e0 /epan/dissectors/packet-mpeg-pes.c | |
parent | ef8009abe3327a460c028cd81258b6590974f2a8 (diff) |
Use ENC_NA as encoding for proto_tree_add_item() calls which directly reference an hf item (in hf[] with types:
FT_NONE
FT_BYTES
FT_IPV6
FT_IPXNET
FT_OID
Note: Encoding field set to ENC_NA only if the field was previously TRUE|FALSE|1|0|ENC_LITTLE_ENDIAN|ENC_BIG_ENDIAN
svn path=/trunk/; revision=39263
Diffstat (limited to 'epan/dissectors/packet-mpeg-pes.c')
-rw-r--r-- | epan/dissectors/packet-mpeg-pes.c | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/epan/dissectors/packet-mpeg-pes.c b/epan/dissectors/packet-mpeg-pes.c index 7a76921cbb..a91d2cfc13 100644 --- a/epan/dissectors/packet-mpeg-pes.c +++ b/epan/dissectors/packet-mpeg-pes.c @@ -639,7 +639,7 @@ dissect_mpeg_pes_header_data(tvbuff_t *tvb, packet_info *pinfo, proto_tree *root, unsigned flags) { proto_item *item = proto_tree_add_item(root, hf_mpeg_pes_header_data, tvb, - 0, -1, FALSE); + 0, -1, ENC_NA); proto_tree *tree = proto_item_add_subtree(item, ett_mpeg_pes_header_data); gint offset = 0; @@ -693,7 +693,7 @@ dissect_mpeg_pes_header_data(tvbuff_t *tvb, packet_info *pinfo, trick_item = proto_tree_add_item(item, hf_mpeg_pes_dsm_trick_mode, tvb, - offset, 1, FALSE); + offset, 1, ENC_NA); trick_tree = proto_item_add_subtree(trick_item, ett_mpeg_pes_trick_mode); @@ -793,7 +793,7 @@ dissect_mpeg_pes_pack_header(tvbuff_t *tvb, gint offset, unsigned program_mux_rate, stuffing_length; proto_item *item = proto_tree_add_item(root, hf_mpeg_pes_pack_header, tvb, - offset / 8, 10, FALSE); + offset / 8, 10, ENC_NA); proto_tree *tree = proto_item_add_subtree(item, ett_mpeg_pes_pack_header); nstime_t nst; @@ -818,7 +818,7 @@ dissect_mpeg_pes_pack_header(tvbuff_t *tvb, gint offset, if (stuffing_length > 0) { proto_tree_add_item(tree, hf_mpeg_pes_stuffing, tvb, - offset / 8, stuffing_length, FALSE); + offset / 8, stuffing_length, ENC_NA); offset += stuffing_length * 8; } @@ -874,7 +874,7 @@ dissect_mpeg_pes(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) offset = dissect_mpeg_pes_Picture(tvb, offset, &asn1_ctx, tree, hf_mpeg_video_picture); proto_tree_add_item(tree, hf_mpeg_video_data, tvb, - offset / 8, -1, FALSE); + offset / 8, -1, ENC_NA); } else if (stream == STREAM_SEQUENCE) { tvbuff_t *es; @@ -882,7 +882,7 @@ dissect_mpeg_pes(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) tree, hf_mpeg_video_sequence_header); proto_tree_add_item(tree, hf_mpeg_video_quantization_matrix, tvb, - offset / 8, 64, FALSE); + offset / 8, 64, ENC_NA); offset += 64 * 8; es = tvb_new_subset_remaining(tvb, offset / 8); @@ -908,7 +908,7 @@ dissect_mpeg_pes(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) offset = dissect_mpeg_pes_pack_header(tvb, offset, pinfo, tree); } else { proto_tree_add_item(tree, hf_mpeg_pes_data, tvb, - offset / 8, 8, FALSE); + offset / 8, 8, ENC_NA); offset += 8 * 8; } } else if (stream == STREAM_SYSTEM || stream == STREAM_PRIVATE2) { @@ -918,7 +918,7 @@ dissect_mpeg_pes(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) offset += 2 * 8; proto_tree_add_item(tree, hf_mpeg_pes_data, tvb, - offset / 8, data_length, FALSE); + offset / 8, data_length, ENC_NA); } else if (stream == STREAM_PADDING) { unsigned padding_length = tvb_get_ntohs(tvb, offset / 8); proto_tree_add_item(tree, hf_mpeg_pes_length, tvb, @@ -926,7 +926,7 @@ dissect_mpeg_pes(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) offset += 2 * 8; proto_tree_add_item(tree, hf_mpeg_pes_padding, tvb, - offset / 8, padding_length, FALSE); + offset / 8, padding_length, ENC_NA); } else if (stream == STREAM_PRIVATE1 || stream >= STREAM_AUDIO) { int length = tvb_get_ntohs(tvb, 4); @@ -962,7 +962,7 @@ dissect_mpeg_pes(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) /* length may be zero for Video stream */ if(length==0){ - proto_tree_add_item(tree, hf_mpeg_pes_data, tvb, (offset>>3),-1, FALSE); + proto_tree_add_item(tree, hf_mpeg_pes_data, tvb, (offset>>3),-1, ENC_NA); return TRUE; } @@ -973,7 +973,7 @@ dissect_mpeg_pes(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) dissect_mpeg(es, pinfo, tree); else proto_tree_add_item(tree, hf_mpeg_pes_data, es, - 0, -1, FALSE); + 0, -1, ENC_NA); } else { unsigned data_length = tvb_get_ntohs(tvb, offset / 8); proto_tree_add_item(tree, hf_mpeg_pes_length, tvb, @@ -981,11 +981,11 @@ dissect_mpeg_pes(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) offset += 2 * 8; proto_tree_add_item(tree, hf_mpeg_pes_data, tvb, - offset / 8, data_length, FALSE); + offset / 8, data_length, ENC_NA); } } else { proto_tree_add_item(tree, hf_mpeg_pes_data, tvb, - offset / 8, -1, FALSE); + offset / 8, -1, ENC_NA); } return TRUE; } |