diff options
| author | Bill Meier <wmeier@newsguy.com> | 2014-12-02 17:34:29 -0500 |
|---|---|---|
| committer | Bill Meier <wmeier@newsguy.com> | 2014-12-02 22:40:26 +0000 |
| commit | c681091a2aa1b53ab60dea8497e331fdccbe6f12 (patch) | |
| tree | 495d160f292a757983a263f9dcd1c7ce58688126 /epan/dissectors/packet-h264.c | |
| parent | 43e759ef8b20ec88f8056f0962a62d12af38925e (diff) | |
Fix instances of duplicate display-filter-names with incompatible types.
Change-Id: I3b5afb8a59f6443624708b9fecfdcbe93dad59ef
Note: Some of the filters, when/if used, could have caused Wireshark crashes.
Reviewed-on: https://code.wireshark.org/review/5575
Reviewed-by: Bill Meier <wmeier@newsguy.com>
Diffstat (limited to 'epan/dissectors/packet-h264.c')
| -rw-r--r-- | epan/dissectors/packet-h264.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/epan/dissectors/packet-h264.c b/epan/dissectors/packet-h264.c index ea38a2ed59..3d141eb89e 100644 --- a/epan/dissectors/packet-h264.c +++ b/epan/dissectors/packet-h264.c @@ -3314,35 +3314,35 @@ proto_register_h264(void) }, #endif { &hf_h264_par_profile, - { "Profile", "h264.profile", + { "Profile", "h264.par_profile", FT_UINT8, BASE_HEX, NULL, 0x00, NULL, HFILL}}, { &hf_h264_par_profile_b, - { "Baseline Profile", "h264.profile.base", + { "Baseline Profile", "h264.par_profile.base", FT_BOOLEAN, 8, NULL, 0x40, NULL, HFILL}}, { &hf_h264_par_profile_m, - { "Main Profile", "h264.profile.main", + { "Main Profile", "h264.par_profile.main", FT_BOOLEAN, 8, NULL, 0x20, NULL, HFILL}}, { &hf_h264_par_profile_e, - { "Extended Profile.", "h264.profile.ext", + { "Extended Profile.", "h264.par_profile.ext", FT_BOOLEAN, 8, NULL, 0x10, NULL, HFILL}}, { &hf_h264_par_profile_h, - { "High Profile", "h264.profile.high", + { "High Profile", "h264.par_profile.high", FT_BOOLEAN, 8, NULL, 0x08, NULL, HFILL}}, { &hf_h264_par_profile_h10, - { "High 10 Profile", "h264.profile.high10", + { "High 10 Profile", "h264.par_profile.high10", FT_BOOLEAN, 8, NULL, 0x04, NULL, HFILL}}, { &hf_h264_par_profile_h4_2_2, - { "High 4:2:2 Profile", "h264.profile.high4_2_2", + { "High 4:2:2 Profile", "h264.par_profile.high4_2_2", FT_BOOLEAN, 8, NULL, 0x02, NULL, HFILL}}, { &hf_h264_par_profile_h4_4_4, - { "High 4:4:4 Profile", "h264.profile.high4_4_4", + { "High 4:4:4 Profile", "h264.par_profile.high4_4_4", FT_BOOLEAN, 8, NULL, 0x01, NULL, HFILL}}, { &hf_h264_par_AdditionalModesSupported, |