diff options
| -rw-r--r-- | epan/dissectors/packet-dvbci.c | 3 | ||||
| -rw-r--r-- | epan/dissectors/packet-mpeg-descriptor.c | 3 | ||||
| -rw-r--r-- | epan/dissectors/packet-mpeg-descriptor.h | 1 |
3 files changed, 5 insertions, 2 deletions
diff --git a/epan/dissectors/packet-dvbci.c b/epan/dissectors/packet-dvbci.c index 28d7b34654..13c27da0bc 100644 --- a/epan/dissectors/packet-dvbci.c +++ b/epan/dissectors/packet-dvbci.c @@ -5735,7 +5735,8 @@ proto_register_dvbci(void) * application id in the capability loop must always be 2 bytes */ { &hf_dvbci_app_cap_bytes, { "Application capability bytes", "dvb-ci.opp.app_cap_bytes", - FT_UINT16, BASE_HEX, NULL, 0, NULL, HFILL } + FT_UINT16, BASE_HEX|BASE_EXT_STRING, + &mpeg_descr_data_bcast_id_vals_ext, 0, NULL, HFILL } }, { &hf_dvbci_desc_num, { "Next unprocessed descriptor number", "dvb-ci.opp.desc_num", diff --git a/epan/dissectors/packet-mpeg-descriptor.c b/epan/dissectors/packet-mpeg-descriptor.c index 6a6b860bcc..8e2f79f92e 100644 --- a/epan/dissectors/packet-mpeg-descriptor.c +++ b/epan/dissectors/packet-mpeg-descriptor.c @@ -1982,7 +1982,8 @@ static const value_string mpeg_descr_data_bcast_id_vals[] = { { 0, NULL } }; -static value_string_ext mpeg_descr_data_bcast_id_vals_ext = VALUE_STRING_EXT_INIT(mpeg_descr_data_bcast_id_vals); +/* global variable that's shared e.g. with DVB-CI */ +value_string_ext mpeg_descr_data_bcast_id_vals_ext = VALUE_STRING_EXT_INIT(mpeg_descr_data_bcast_id_vals); static void proto_mpeg_descriptor_dissect_data_bcast(tvbuff_t *tvb, guint offset, proto_tree *tree) diff --git a/epan/dissectors/packet-mpeg-descriptor.h b/epan/dissectors/packet-mpeg-descriptor.h index 4c6adf03b8..5ee158555a 100644 --- a/epan/dissectors/packet-mpeg-descriptor.h +++ b/epan/dissectors/packet-mpeg-descriptor.h @@ -32,6 +32,7 @@ #include <epan/value_string.h> extern value_string_ext mpeg_descr_service_type_vals_ext; +extern value_string_ext mpeg_descr_data_bcast_id_vals_ext; guint proto_mpeg_descriptor_dissect(tvbuff_t *tvb, guint offset, proto_tree *tree); guint proto_mpeg_descriptor_loop_dissect(tvbuff_t *tvb, guint offset, guint loop_len, proto_tree *tree); |