diff options
| author | Martin Kaiser <wireshark@kaiser.cx> | 2013-12-15 18:38:35 +0000 |
|---|---|---|
| committer | Martin Kaiser <wireshark@kaiser.cx> | 2013-12-15 18:38:35 +0000 |
| commit | 9f22d3a558a1e90f4dd540ecc9ec6b02fc4bae9b (patch) | |
| tree | 36c9be541dff42b02e4617f5b00eed37b04407f9 /epan/dissectors/packet-mpeg-descriptor.c | |
| parent | 9ce9b10645812e887d2554099371986b5d096372 (diff) | |
improve DVB-SI string handling
new function dvb_add_chartbl() adds a tree entry for an encoding
use FT_BTYES as type for encoding hfs
string hfs for DVB-SI strings must have STR_UNICODE, not BASE_NONE
make dvb_string_encoding_vals[] internal to dvb_chartbl.c
svn path=/trunk/; revision=54128
Diffstat (limited to 'epan/dissectors/packet-mpeg-descriptor.c')
| -rw-r--r-- | epan/dissectors/packet-mpeg-descriptor.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/epan/dissectors/packet-mpeg-descriptor.c b/epan/dissectors/packet-mpeg-descriptor.c index d57e52b99a..93ad6c1034 100644 --- a/epan/dissectors/packet-mpeg-descriptor.c +++ b/epan/dissectors/packet-mpeg-descriptor.c @@ -1212,7 +1212,7 @@ proto_mpeg_descriptor_dissect_short_event(tvbuff_t *tvb, guint offset, proto_tre if (name_len>0) { enc_len = dvb_analyze_string_charset(tvb, offset, name_len, &encoding); - proto_tree_add_uint(tree, hf_mpeg_descr_short_event_name_encoding, tvb, offset, enc_len, encoding); + dvb_add_chartbl(tree, hf_mpeg_descr_short_event_name_encoding, tvb, offset, enc_len, encoding); proto_tree_add_item(tree, hf_mpeg_descr_short_event_name, tvb, offset+enc_len, name_len-enc_len, dvb_enc_to_item_enc(encoding)); } @@ -3515,12 +3515,12 @@ proto_register_mpeg_descriptor(void) { &hf_mpeg_descr_short_event_name_encoding, { "Event Name Encoding", "mpeg_descr.short_evt.name_enc", - FT_UINT32, BASE_HEX, VALS(dvb_string_encoding_vals), 0, NULL, HFILL + FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL } }, { &hf_mpeg_descr_short_event_name, { "Event Name", "mpeg_descr.short_evt.name", - FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL + FT_STRING, STR_UNICODE, NULL, 0, NULL, HFILL } }, { &hf_mpeg_descr_short_event_text_length, { |