From Kovarththanan Rajaratnam via bug 3548:

(1) Trailing/leading spaces are removed from 'name's/'blurb's
(2) Duplicate 'blurb's are replaced with NULL
(3) Empty ("") 'blurb's are replaced with NULL
(4) BASE_NONE, NULL, 0x0 are used for 'display', 'strings' and 'bitmask' fields
    for FT_NONE, FT_BYTES, FT_IPv4, FT_IPv6, FT_ABSOLUTE_TIME, FT_RELATIVE_TIME,
    FT_PROTOCOL, FT_STRING and FT_STRINGZ field types
(5) Only allow non-zero value for 'display' if 'bitmask' is non-zero

svn path=/trunk/; revision=28770

1 files changed, 32 insertions, 32 deletions

diff --git a/epan/dissectors/packet-mpeg-pes.c b/epan/dissectors/packet-mpeg-pes.c
index 7c8d3d57eb..4521f13b13 100644
--- a/epan/dissectors/packet-mpeg-pes.c
+++ b/epan/dissectors/packet-mpeg-pes.c
@@ -925,7 +925,7 @@ proto_register_mpeg_pes(void)
 #line 1 "packet-mpeg-pes-hfarr.c"
     { &hf_mpeg_pes_prefix,
       { "prefix", "mpeg-pes.prefix",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "mpeg_pes.OCTET_STRING_SIZE_3", HFILL }},
     { &hf_mpeg_pes_stream,
       { "stream", "mpeg-pes.stream",
@@ -937,11 +937,11 @@ proto_register_mpeg_pes(void)
         "mpeg_pes.INTEGER_0_65535", HFILL }},
     { &hf_mpeg_pes_must_be_one,
       { "must-be-one", "mpeg-pes.must_be_one",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "mpeg_pes.BOOLEAN", HFILL }},
     { &hf_mpeg_pes_must_be_zero,
       { "must-be-zero", "mpeg-pes.must_be_zero",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "mpeg_pes.BOOLEAN", HFILL }},
     { &hf_mpeg_pes_scrambling_control,
       { "scrambling-control", "mpeg-pes.scrambling_control",
@@ -949,51 +949,51 @@ proto_register_mpeg_pes(void)
         "mpeg_pes.T_scrambling_control", HFILL }},
     { &hf_mpeg_pes_priority,
       { "priority", "mpeg-pes.priority",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "mpeg_pes.BOOLEAN", HFILL }},
     { &hf_mpeg_pes_data_alignment,
       { "data-alignment", "mpeg-pes.data_alignment",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "mpeg_pes.BOOLEAN", HFILL }},
     { &hf_mpeg_pes_copyright,
       { "copyright", "mpeg-pes.copyright",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "mpeg_pes.BOOLEAN", HFILL }},
     { &hf_mpeg_pes_original,
       { "original", "mpeg-pes.original",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "mpeg_pes.BOOLEAN", HFILL }},
     { &hf_mpeg_pes_pts_flag,
       { "pts-flag", "mpeg-pes.pts_flag",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "mpeg_pes.BOOLEAN", HFILL }},
     { &hf_mpeg_pes_dts_flag,
       { "dts-flag", "mpeg-pes.dts_flag",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "mpeg_pes.BOOLEAN", HFILL }},
     { &hf_mpeg_pes_escr_flag,
       { "escr-flag", "mpeg-pes.escr_flag",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "mpeg_pes.BOOLEAN", HFILL }},
     { &hf_mpeg_pes_es_rate_flag,
       { "es-rate-flag", "mpeg-pes.es_rate_flag",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "mpeg_pes.BOOLEAN", HFILL }},
     { &hf_mpeg_pes_dsm_trick_mode_flag,
       { "dsm-trick-mode-flag", "mpeg-pes.dsm_trick_mode_flag",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "mpeg_pes.BOOLEAN", HFILL }},
     { &hf_mpeg_pes_additional_copy_info_flag,
       { "additional-copy-info-flag", "mpeg-pes.additional_copy_info_flag",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "mpeg_pes.BOOLEAN", HFILL }},
     { &hf_mpeg_pes_crc_flag,
       { "crc-flag", "mpeg-pes.crc_flag",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "mpeg_pes.BOOLEAN", HFILL }},
     { &hf_mpeg_pes_extension_flag,
       { "extension-flag", "mpeg-pes.extension_flag",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "mpeg_pes.BOOLEAN", HFILL }},
     { &hf_mpeg_pes_header_data_length,
       { "header-data-length", "mpeg-pes.header_data_length",
@@ -1001,11 +1001,11 @@ proto_register_mpeg_pes(void)
         "mpeg_pes.INTEGER_0_255", HFILL }},
     { &hf_mpeg_pes_horizontal_size,
       { "horizontal-size", "mpeg-pes.horizontal_size",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "mpeg_pes.BIT_STRING_SIZE_12", HFILL }},
     { &hf_mpeg_pes_vertical_size,
       { "vertical-size", "mpeg-pes.vertical_size",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "mpeg_pes.BIT_STRING_SIZE_12", HFILL }},
     { &hf_mpeg_pes_aspect_ratio,
       { "aspect-ratio", "mpeg-pes.aspect_ratio",
@@ -1017,27 +1017,27 @@ proto_register_mpeg_pes(void)
         "mpeg_pes.T_frame_rate", HFILL }},
     { &hf_mpeg_pes_bit_rate,
       { "bit-rate", "mpeg-pes.bit_rate",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "mpeg_pes.BIT_STRING_SIZE_18", HFILL }},
     { &hf_mpeg_pes_vbv_buffer_size,
       { "vbv-buffer-size", "mpeg-pes.vbv_buffer_size",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "mpeg_pes.BIT_STRING_SIZE_10", HFILL }},
     { &hf_mpeg_pes_constrained_parameters_flag,
       { "constrained-parameters-flag", "mpeg-pes.constrained_parameters_flag",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "mpeg_pes.BOOLEAN", HFILL }},
     { &hf_mpeg_pes_load_intra_quantiser_matrix,
       { "load-intra-quantiser-matrix", "mpeg-pes.load_intra_quantiser_matrix",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "mpeg_pes.BOOLEAN", HFILL }},
     { &hf_mpeg_pes_load_non_intra_quantiser_matrix,
       { "load-non-intra-quantiser-matrix", "mpeg-pes.load_non_intra_quantiser_matrix",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "mpeg_pes.BOOLEAN", HFILL }},
     { &hf_mpeg_pes_must_be_0001,
       { "must-be-0001", "mpeg-pes.must_be_0001",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "mpeg_pes.BIT_STRING_SIZE_4", HFILL }},
     { &hf_mpeg_pes_profile_and_level,
       { "profile-and-level", "mpeg-pes.profile_and_level",
@@ -1045,7 +1045,7 @@ proto_register_mpeg_pes(void)
         "mpeg_pes.INTEGER_0_255", HFILL }},
     { &hf_mpeg_pes_progressive_sequence,
       { "progressive-sequence", "mpeg-pes.progressive_sequence",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "mpeg_pes.BOOLEAN", HFILL }},
     { &hf_mpeg_pes_chroma_format,
       { "chroma-format", "mpeg-pes.chroma_format",
@@ -1061,7 +1061,7 @@ proto_register_mpeg_pes(void)
         "mpeg_pes.INTEGER_0_3", HFILL }},
     { &hf_mpeg_pes_bit_rate_extension,
       { "bit-rate-extension", "mpeg-pes.bit_rate_extension",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "mpeg_pes.BIT_STRING_SIZE_12", HFILL }},
     { &hf_mpeg_pes_vbv_buffer_size_extension,
       { "vbv-buffer-size-extension", "mpeg-pes.vbv_buffer_size_extension",
@@ -1069,7 +1069,7 @@ proto_register_mpeg_pes(void)
         "mpeg_pes.INTEGER_0_255", HFILL }},
     { &hf_mpeg_pes_low_delay,
       { "low-delay", "mpeg-pes.low_delay",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "mpeg_pes.BOOLEAN", HFILL }},
     { &hf_mpeg_pes_frame_rate_extension_n,
       { "frame-rate-extension-n", "mpeg-pes.frame_rate_extension_n",
@@ -1081,7 +1081,7 @@ proto_register_mpeg_pes(void)
         "mpeg_pes.INTEGER_0_3", HFILL }},
     { &hf_mpeg_pes_drop_frame_flag,
       { "drop-frame-flag", "mpeg-pes.drop_frame_flag",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "mpeg_pes.BOOLEAN", HFILL }},
     { &hf_mpeg_pes_hour,
       { "hour", "mpeg-pes.hour",
@@ -1101,19 +1101,19 @@ proto_register_mpeg_pes(void)
         "mpeg_pes.INTEGER_0_64", HFILL }},
     { &hf_mpeg_pes_closed_gop,
       { "closed-gop", "mpeg-pes.closed_gop",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "mpeg_pes.BOOLEAN", HFILL }},
     { &hf_mpeg_pes_broken_gop,
       { "broken-gop", "mpeg-pes.broken_gop",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "mpeg_pes.BOOLEAN", HFILL }},
     { &hf_mpeg_pes_must_be_zero_01,
       { "must-be-zero", "mpeg-pes.must_be_zero",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "mpeg_pes.BIT_STRING_SIZE_5", HFILL }},
     { &hf_mpeg_pes_temporal_sequence_number,
       { "temporal-sequence-number", "mpeg-pes.temporal_sequence_number",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "mpeg_pes.BIT_STRING_SIZE_10", HFILL }},
     { &hf_mpeg_pes_frame_type,
       { "frame-type", "mpeg-pes.frame_type",
@@ -1121,7 +1121,7 @@ proto_register_mpeg_pes(void)
         "mpeg_pes.T_frame_type", HFILL }},
     { &hf_mpeg_pes_vbv_delay,
       { "vbv-delay", "mpeg-pes.vbv_delay",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "mpeg_pes.BIT_STRING_SIZE_16", HFILL }},
 
 /*--- End of included file: packet-mpeg-pes-hfarr.c ---*/