From Aaron Woo (via Jeff Weston): Optimized Link State Routing Protocol

[obnox/wireshark/wip.git] / packet-h245.c

diff --git a/packet-h245.c b/packet-h245.c
index 18debe7e40ad8119f20260a80e68d8f04e98a4e1..50be7a098c2cdac0e8bd1c9fbda6a727098d3c8f 100644 (file)
--- a/packet-h245.c
+++ b/packet-h245.c
@@ -4,7 +4,10 @@
  *       with great support with testing and providing capturefiles
  *       from Martin Regner
  *
- * $Id: packet-h245.c,v 1.27 2003/07/31 10:28:12 sahlberg Exp $
+ *
+ * Maintained by Andreas Sikkema (andreas.sikkema@philips.com)
+ *
+ * $Id: packet-h245.c,v 1.44 2004/01/10 13:49:52 jmayer Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
@@ -31,6 +34,7 @@
 
 #include <glib.h>
 #include <epan/packet.h>
+#include <epan/conversation.h>
 
 #include <stdio.h>
 #include <string.h>
@@ -38,6 +42,10 @@
 #include "prefs.h"
 #include "packet-tpkt.h"
 #include "packet-per.h"
+#include "t35.h"
+
+static dissector_handle_t rtp_handle=NULL;
+static dissector_handle_t rtcp_handle=NULL;
 
 static dissector_handle_t h245_handle;
 static dissector_handle_t MultimediaSystemControlMessage_handle;
@@ -972,6 +980,8 @@ static int hf_h245_recoveryReferencePicture = -1;
 static int hf_h245_iPSourceRouteAddress_route = -1;
 static int hf_h245_audioTelephoneEvent = -1;
 static int hf_h245_alphanumeric = -1;
+static int hf_h245_h221Manufacturer = -1;
+
 
 static gint ett_h245 = -1;
 static gint ett_h245_VCCapability_set_of = -1;
@@ -1454,9 +1464,24 @@ static gint ett_h245_lostPicture = -1;
 static gint ett_h245_recoveryReferencePicture = -1;
 static gint ett_h245_iPSourceRouteAddress_route = -1;
 
+static dissector_table_t nsp_object_dissector_table;
+static dissector_table_t nsp_h221_dissector_table;
 
+static dissector_handle_t nsp_handle;
+
+static guint32 ipv4_address;
+static guint32 ipv4_port;
+static char object[256];
+static guint32 t35CountryCode;
+static guint32 t35Extension;
+static guint32 manufacturerCode;
+static guint32 h221NonStandard;
 
 static gboolean h245_reassembly = TRUE;
+static gboolean h245_shorttypes = FALSE;
+/* To put the codec type only in COL_INFO when
+   an OLC is read */
+char* codec_type = NULL;
 
 static int
 dissect_h245_NULL(tvbuff_t *tvb _U_, int offset, packet_info *pinfo _U_, proto_tree *tree _U_)
@@ -1477,9 +1502,9 @@ static const value_string MasterSlaveDeterminationAck_decision_vals[] = {
        {  0, NULL }
 };
 static per_choice_t MasterSlaveDeterminationAck_decision_choice[] = {
-       {  0, "master", NO_EXTENSIONS, 
+       {  0, "master", ASN1_NO_EXTENSIONS,
                dissect_h245_NULL },
-       {  1, "slave", NO_EXTENSIONS, 
+       {  1, "slave", ASN1_NO_EXTENSIONS,
                dissect_h245_NULL },
        {  0, NULL, 0, NULL }
 };
@@ -1494,7 +1519,7 @@ dissect_h245_MasterSlaveDeterminationAck_decision(tvbuff_t *tvb, int offset, pac
 
 
 static per_sequence_t MasterSlaveDeterminationAck_sequence[] = {
-       { "decision", EXTENSION_ROOT, NOT_OPTIONAL, 
+       { "decision", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_MasterSlaveDeterminationAck_decision },
        { NULL, 0, 0, NULL }
 };
@@ -1512,7 +1537,7 @@ static const value_string MasterSlaveDeterminationReject_cause_vals[] = {
        {  0, NULL }
 };
 static per_choice_t MasterSlaveDeterminationReject_cause_choice[] = {
-       {  0, "identicalNumbers", EXTENSION_ROOT, 
+       {  0, "identicalNumbers", ASN1_EXTENSION_ROOT,
                        dissect_h245_NULL },
        {  0, NULL, 0, NULL }
 };
@@ -1527,7 +1552,7 @@ dissect_h245_MasterSlaveDeterminationReject_cause(tvbuff_t *tvb, int offset, pac
 
 
 static per_sequence_t MasterSlaveDeterminationReject_sequence[] = {
-       { "cause", EXTENSION_ROOT, NOT_OPTIONAL, 
+       { "cause", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_MasterSlaveDeterminationReject_cause },
        { NULL, 0, 0, NULL }
 };
@@ -1547,9 +1572,9 @@ static const value_string QOSMode_vals[] = {
        {  0, NULL }
 };
 static per_choice_t QOSMode_choice[] = {
-       {  0, "guaranteedQOS", EXTENSION_ROOT, 
+       {  0, "guaranteedQOS", ASN1_EXTENSION_ROOT,
                        dissect_h245_NULL },
-       {  1, "controlledLoad", EXTENSION_ROOT, 
+       {  1, "controlledLoad", ASN1_EXTENSION_ROOT,
                        dissect_h245_NULL },
        {  0, NULL, 0, NULL }
 };
@@ -1572,15 +1597,15 @@ static const value_string RefPictureSelection_videoBackChannelSend_vals[] = {
        {  0, NULL }
 };
 static per_choice_t RefPictureSelection_videoBackChannelSend_choice[] = {
-       {  0, "none", EXTENSION_ROOT, 
+       {  0, "none", ASN1_EXTENSION_ROOT,
                        dissect_h245_NULL },
-       {  1, "ackMessageOnly", EXTENSION_ROOT, 
+       {  1, "ackMessageOnly", ASN1_EXTENSION_ROOT,
                        dissect_h245_NULL },
-       {  2, "nackMessageOnly", EXTENSION_ROOT, 
+       {  2, "nackMessageOnly", ASN1_EXTENSION_ROOT,
                        dissect_h245_NULL },
-       {  3, "ackOrNackMessageOnly", EXTENSION_ROOT, 
+       {  3, "ackOrNackMessageOnly", ASN1_EXTENSION_ROOT,
                        dissect_h245_NULL },
-       {  4, "ackAndNackMessage", EXTENSION_ROOT, 
+       {  4, "ackAndNackMessage", ASN1_EXTENSION_ROOT,
                        dissect_h245_NULL },
        {  0, NULL, 0, NULL }
 };
@@ -1600,9 +1625,9 @@ static const value_string T38FaxRateManagement_vals[] = {
        {  0, NULL }
 };
 static per_choice_t T38FaxRateManagement_choice[] = {
-       {  0, "localTCF", EXTENSION_ROOT, 
+       {  0, "localTCF", ASN1_EXTENSION_ROOT,
                        dissect_h245_NULL },
-       {  1, "transferredTCF", EXTENSION_ROOT, 
+       {  1, "transferredTCF", ASN1_EXTENSION_ROOT,
                        dissect_h245_NULL },
        {  0, NULL, 0, NULL }
 };
@@ -1622,9 +1647,9 @@ static const value_string T38FaxUdpOptions_t38FaxUdpEC_vals[] = {
        {  0, NULL }
 };
 static per_choice_t T38FaxUdpOptions_t38FaxUdpEC_choice[] = {
-       {  0, "t38UDPFEC", EXTENSION_ROOT, 
+       {  0, "t38UDPFEC", ASN1_EXTENSION_ROOT,
                        dissect_h245_NULL },
-       {  1, "t38UDPRedundancy", EXTENSION_ROOT, 
+       {  1, "t38UDPRedundancy", ASN1_EXTENSION_ROOT,
                        dissect_h245_NULL },
        {  0, NULL, 0, NULL }
 };
@@ -1644,9 +1669,9 @@ static const value_string NetworkAccessParameters_distribution_vals[] = {
        {  0, NULL }
 };
 static per_choice_t NetworkAccessParameters_distribution_choice[] = {
-       {  0, "unicast", EXTENSION_ROOT, 
+       {  0, "unicast", ASN1_EXTENSION_ROOT,
                        dissect_h245_NULL },
-       {  1, "multicast", EXTENSION_ROOT, 
+       {  1, "multicast", ASN1_EXTENSION_ROOT,
                        dissect_h245_NULL },
        {  0, NULL, 0, NULL }
 };
@@ -1667,11 +1692,11 @@ static const value_string NetworkAccessParameters_t120SetupProcedure_vals[] = {
        {  0, NULL }
 };
 static per_choice_t NetworkAccessParameters_t120SetupProcedure_choice[] = {
-       {  0, "originateCall", EXTENSION_ROOT, 
+       {  0, "originateCall", ASN1_EXTENSION_ROOT,
                        dissect_h245_NULL },
-       {  1, "waitForCall", EXTENSION_ROOT, 
+       {  1, "waitForCall", ASN1_EXTENSION_ROOT,
                        dissect_h245_NULL },
-       {  2, "issueQuery", EXTENSION_ROOT, 
+       {  2, "issueQuery", ASN1_EXTENSION_ROOT,
                        dissect_h245_NULL },
        {  0, NULL, 0, NULL }
 };
@@ -1691,9 +1716,9 @@ static const value_string H223AL1MParameters_transferMode_vals[] = {
        {  0, NULL }
 };
 static per_choice_t H223AL1MParameters_transferMode_choice[] = {
-       {  0, "framed", EXTENSION_ROOT, 
+       {  0, "framed", ASN1_EXTENSION_ROOT,
                        dissect_h245_NULL },
-       {  1, "unframed", EXTENSION_ROOT, 
+       {  1, "unframed", ASN1_EXTENSION_ROOT,
                        dissect_h245_NULL },
        {  0, NULL, 0, NULL }
 };
@@ -1713,9 +1738,9 @@ static const value_string H223AL1MParameters_headerFEC_vals[] = {
        {  0, NULL }
 };
 static per_choice_t H223AL1MParameters_headerFEC_choice[] = {
-       {  0, "sebch16-7", EXTENSION_ROOT, 
+       {  0, "sebch16-7", ASN1_EXTENSION_ROOT,
                        dissect_h245_NULL },
-       {  1, "golay24-12", EXTENSION_ROOT, 
+       {  1, "golay24-12", ASN1_EXTENSION_ROOT,
                        dissect_h245_NULL },
        {  0, NULL, 0, NULL }
 };
@@ -1741,21 +1766,21 @@ static const value_string H223AL1MParameters_crcLength_vals[] = {
        {  0, NULL }
 };
 static per_choice_t H223AL1MParameters_crcLength_choice[] = {
-       {  0, "crc4bit", EXTENSION_ROOT, 
+       {  0, "crc4bit", ASN1_EXTENSION_ROOT,
                        dissect_h245_NULL },
-       {  1, "crc12bit", EXTENSION_ROOT, 
+       {  1, "crc12bit", ASN1_EXTENSION_ROOT,
                        dissect_h245_NULL },
-       {  2, "crc20bit", EXTENSION_ROOT, 
+       {  2, "crc20bit", ASN1_EXTENSION_ROOT,
                        dissect_h245_NULL },
-       {  3, "crc28bit", EXTENSION_ROOT, 
+       {  3, "crc28bit", ASN1_EXTENSION_ROOT,
                        dissect_h245_NULL },
-       {  4, "crc8bit", NOT_EXTENSION_ROOT, 
+       {  4, "crc8bit", ASN1_NOT_EXTENSION_ROOT,
                        dissect_h245_NULL },
-       {  5, "crc16bit", NOT_EXTENSION_ROOT, 
+       {  5, "crc16bit", ASN1_NOT_EXTENSION_ROOT,
                        dissect_h245_NULL },
-       {  6, "crc32bit", NOT_EXTENSION_ROOT, 
+       {  6, "crc32bit", ASN1_NOT_EXTENSION_ROOT,
                        dissect_h245_NULL },
-       {  7, "crcNotUsed", NOT_EXTENSION_ROOT, 
+       {  7, "crcNotUsed", ASN1_NOT_EXTENSION_ROOT,
                        dissect_h245_NULL },
        {  0, NULL, 0, NULL }
 };
@@ -1775,9 +1800,9 @@ static const value_string H223AL2MParameters_headerFEC_vals[] = {
        {  0, NULL }
 };
 static per_choice_t H223AL2MParameters_headerFEC_choice[] = {
-       {  0, "sebch16-5", EXTENSION_ROOT, 
+       {  0, "sebch16-5", ASN1_EXTENSION_ROOT,
                        dissect_h245_NULL },
-       {  1, "golay24-12", EXTENSION_ROOT, 
+       {  1, "golay24-12", ASN1_EXTENSION_ROOT,
                        dissect_h245_NULL },
        {  0, NULL, 0, NULL }
 };
@@ -1798,9 +1823,9 @@ static const value_string H223AL3MParameters_headerFormat_vals[] = {
        {  0, NULL }
 };
 static per_choice_t H223AL3MParameters_headerFormat_choice[] = {
-       {  0, "sebch16-7", EXTENSION_ROOT, 
+       {  0, "sebch16-7", ASN1_EXTENSION_ROOT,
                        dissect_h245_NULL },
-       {  1, "golay24-12", EXTENSION_ROOT, 
+       {  1, "golay24-12", ASN1_EXTENSION_ROOT,
                        dissect_h245_NULL },
        {  0, NULL, 0, NULL }
 };
@@ -1827,21 +1852,21 @@ static const value_string H223AL3MParameters_crcLength_vals[] = {
        {  0, NULL }
 };
 static per_choice_t H223AL3MParameters_crcLength_choice[] = {
-       {  0, "crc4bit", EXTENSION_ROOT, 
+       {  0, "crc4bit", ASN1_EXTENSION_ROOT,
                        dissect_h245_NULL },
-       {  1, "crc12bit", EXTENSION_ROOT, 
+       {  1, "crc12bit", ASN1_EXTENSION_ROOT,
                        dissect_h245_NULL },
-       {  2, "crc20bit", EXTENSION_ROOT, 
+       {  2, "crc20bit", ASN1_EXTENSION_ROOT,
                        dissect_h245_NULL },
-       {  3, "crc28bit", EXTENSION_ROOT, 
+       {  3, "crc28bit", ASN1_EXTENSION_ROOT,
                        dissect_h245_NULL },
-       {  4, "crc8bit", NOT_EXTENSION_ROOT, 
+       {  4, "crc8bit", ASN1_NOT_EXTENSION_ROOT,
                        dissect_h245_NULL },
-       {  5, "crc16bit", NOT_EXTENSION_ROOT, 
+       {  5, "crc16bit", ASN1_NOT_EXTENSION_ROOT,
                        dissect_h245_NULL },
-       {  6, "crc32bit", NOT_EXTENSION_ROOT, 
+       {  6, "crc32bit", ASN1_NOT_EXTENSION_ROOT,
                        dissect_h245_NULL },
-       {  7, "crcNotUsed", NOT_EXTENSION_ROOT, 
+       {  7, "crcNotUsed", ASN1_NOT_EXTENSION_ROOT,
                        dissect_h245_NULL },
        {  0, NULL, 0, NULL }
 };
@@ -1863,11 +1888,11 @@ static const value_string V76LogicalChannelParameters_suspendResume_vals[] = {
        {  0, NULL }
 };
 static per_choice_t V76LogicalChannelParameters_suspendResume_choice[] = {
-       {  0, "noSuspendResume", EXTENSION_ROOT, 
+       {  0, "noSuspendResume", ASN1_EXTENSION_ROOT,
                        dissect_h245_NULL },
-       {  1, "suspendResumewAddress", EXTENSION_ROOT, 
+       {  1, "suspendResumewAddress", ASN1_EXTENSION_ROOT,
                        dissect_h245_NULL },
-       {  2, "suspendResumewoAddress", EXTENSION_ROOT, 
+       {  2, "suspendResumewoAddress", ASN1_EXTENSION_ROOT,
                        dissect_h245_NULL },
        {  0, NULL, 0, NULL }
 };
@@ -1889,11 +1914,11 @@ static const value_string V76LogicalChannelParameters_mode_eRM_recovery_vals[] =
        {  0, NULL }
 };
 static per_choice_t V76LogicalChannelParameters_mode_eRM_recovery_choice[] = {
-       {  0, "rej", EXTENSION_ROOT, 
+       {  0, "rej", ASN1_EXTENSION_ROOT,
                        dissect_h245_NULL },
-       {  1, "sREJ", EXTENSION_ROOT, 
+       {  1, "sREJ", ASN1_EXTENSION_ROOT,
                        dissect_h245_NULL },
-       {  2, "mSREJ", EXTENSION_ROOT, 
+       {  2, "mSREJ", ASN1_EXTENSION_ROOT,
                        dissect_h245_NULL },
        {  0, NULL, 0, NULL }
 };
@@ -1915,11 +1940,11 @@ static const value_string CRCLength_vals[] = {
        {  0, NULL }
 };
 static per_choice_t CRCLength_choice[] = {
-       {  0, "crc8bit", EXTENSION_ROOT, 
+       {  0, "crc8bit", ASN1_EXTENSION_ROOT,
                        dissect_h245_NULL },
-       {  1, "crc16bit", EXTENSION_ROOT, 
+       {  1, "crc16bit", ASN1_EXTENSION_ROOT,
                        dissect_h245_NULL },
-       {  2, "crc32bit", EXTENSION_ROOT, 
+       {  2, "crc32bit", ASN1_EXTENSION_ROOT,
                        dissect_h245_NULL },
        {  0, NULL, 0, NULL }
 };
@@ -1940,9 +1965,9 @@ static const value_string UnicastAddress_iPSourceRouteAddress_routing_vals[] = {
        {  0, NULL }
 };
 static per_choice_t UnicastAddress_iPSourceRouteAddress_routing_choice[] = {
-       {  0, "strict", NO_EXTENSIONS, 
+       {  0, "strict", ASN1_NO_EXTENSIONS,
                        dissect_h245_NULL },
-       {  1, "loose", NO_EXTENSIONS, 
+       {  1, "loose", ASN1_NO_EXTENSIONS,
                        dissect_h245_NULL },
        {  0, NULL, 0, NULL }
 };
@@ -1975,33 +2000,33 @@ static const value_string OpenLogicalChannelReject_cause_vals[] = {
        {  0, NULL }
 };
 static per_choice_t OpenLogicalChannelReject_cause_choice[] = {
-       {  0, "unspecified", EXTENSION_ROOT, 
+       {  0, "unspecified", ASN1_EXTENSION_ROOT,
                        dissect_h245_NULL },
-       {  1, "unsuitableReverseParameters", EXTENSION_ROOT, 
+       {  1, "unsuitableReverseParameters", ASN1_EXTENSION_ROOT,
                        dissect_h245_NULL },
-       {  2, "dataTypeNotSupported", EXTENSION_ROOT, 
+       {  2, "dataTypeNotSupported", ASN1_EXTENSION_ROOT,
                        dissect_h245_NULL },
-       {  3, "dataTypeNotAvailable", EXTENSION_ROOT, 
+       {  3, "dataTypeNotAvailable", ASN1_EXTENSION_ROOT,
                        dissect_h245_NULL },
-       {  4, "unknownDataType", EXTENSION_ROOT, 
+       {  4, "unknownDataType", ASN1_EXTENSION_ROOT,
                        dissect_h245_NULL },
-       {  5, "dataTypeALCombinationNotSupported", EXTENSION_ROOT, 
+       {  5, "dataTypeALCombinationNotSupported", ASN1_EXTENSION_ROOT,
                        dissect_h245_NULL },
-       {  6, "multicastChannelNotAllowed", NOT_EXTENSION_ROOT, 
+       {  6, "multicastChannelNotAllowed", ASN1_NOT_EXTENSION_ROOT,
                        dissect_h245_NULL },
-       {  7, "insufficientBandwidth", NOT_EXTENSION_ROOT, 
+       {  7, "insufficientBandwidth", ASN1_NOT_EXTENSION_ROOT,
                        dissect_h245_NULL },
-       {  8, "separateStackEstablishmentFailed", NOT_EXTENSION_ROOT, 
+       {  8, "separateStackEstablishmentFailed", ASN1_NOT_EXTENSION_ROOT,
                        dissect_h245_NULL },
-       {  9, "invalidSessionID", NOT_EXTENSION_ROOT, 
+       {  9, "invalidSessionID", ASN1_NOT_EXTENSION_ROOT,
                        dissect_h245_NULL },
-       { 10, "masterSlaveConflict", NOT_EXTENSION_ROOT, 
+       { 10, "masterSlaveConflict", ASN1_NOT_EXTENSION_ROOT,
                        dissect_h245_NULL },
-       { 11, "waitForCommunicationMode", NOT_EXTENSION_ROOT, 
+       { 11, "waitForCommunicationMode", ASN1_NOT_EXTENSION_ROOT,
                        dissect_h245_NULL },
-       { 12, "invalidDependentChannel", NOT_EXTENSION_ROOT, 
+       { 12, "invalidDependentChannel", ASN1_NOT_EXTENSION_ROOT,
                        dissect_h245_NULL },
-       { 13, "replacementForRejected", NOT_EXTENSION_ROOT, 
+       { 13, "replacementForRejected", ASN1_NOT_EXTENSION_ROOT,
                        dissect_h245_NULL },
        {  0, NULL, 0, NULL }
 };
@@ -2021,9 +2046,9 @@ static const value_string CloseLogicalChannel_source_vals[] = {
        {  0, NULL }
 };
 static per_choice_t CloseLogicalChannel_source_choice[] = {
-       {  0, "user", NO_EXTENSIONS, 
+       {  0, "user", ASN1_NO_EXTENSIONS,
                        dissect_h245_NULL },
-       {  1, "lcse", NO_EXTENSIONS, 
+       {  1, "lcse", ASN1_NO_EXTENSIONS,
                        dissect_h245_NULL },
        {  0, NULL, 0, NULL }
 };
@@ -2043,11 +2068,11 @@ static const value_string CloseLogicalChannel_reason_vals[] = {
        {  0, NULL }
 };
 static per_choice_t CloseLogicalChannel_reason_choice[] = {
-       {  0, "unknown", EXTENSION_ROOT, 
+       {  0, "unknown", ASN1_EXTENSION_ROOT,
                        dissect_h245_NULL },
-       {  1, "reopen", EXTENSION_ROOT, 
+       {  1, "reopen", ASN1_EXTENSION_ROOT,
                        dissect_h245_NULL },
-       {  2, "reservationFailure", EXTENSION_ROOT, 
+       {  2, "reservationFailure", ASN1_EXTENSION_ROOT,
                        dissect_h245_NULL },
        {  0, NULL, 0, NULL }
 };
@@ -2069,13 +2094,13 @@ static const value_string RequestChannelClose_reason_vals[] = {
        {  0, NULL }
 };
 static per_choice_t RequestChannelClose_reason_choice[] = {
-       {  0, "unknown", EXTENSION_ROOT, 
+       {  0, "unknown", ASN1_EXTENSION_ROOT,
                        dissect_h245_NULL },
-       {  1, "normal", EXTENSION_ROOT, 
+       {  1, "normal", ASN1_EXTENSION_ROOT,
                        dissect_h245_NULL },
-       {  2, "reopen", EXTENSION_ROOT, 
+       {  2, "reopen", ASN1_EXTENSION_ROOT,
                        dissect_h245_NULL },
-       {  3, "reservationFailure", EXTENSION_ROOT, 
+       {  3, "reservationFailure", ASN1_EXTENSION_ROOT,
                        dissect_h245_NULL },
        {  0, NULL, 0, NULL }
 };
@@ -2094,7 +2119,7 @@ static const value_string RequestChannelCloseReject_cause_vals[] = {
        {  0, NULL }
 };
 static per_choice_t RequestChannelCloseReject_cause_choice[] = {
-       {  0, "unspecified", EXTENSION_ROOT, 
+       {  0, "unspecified", ASN1_EXTENSION_ROOT,
                        dissect_h245_NULL },
        {  0, NULL, 0, NULL }
 };
@@ -2115,9 +2140,9 @@ static const value_string MultiplexEntryRejectionDescriptions_cause_vals[] = {
        {  0, NULL }
 };
 static per_choice_t MultiplexEntryRejectionDescriptions_cause_choice[] = {
-       {  0, "unspecifiedCause", EXTENSION_ROOT, 
+       {  0, "unspecifiedCause", ASN1_EXTENSION_ROOT,
                        dissect_h245_NULL },
-       {  1, "descriptorTooComplex", EXTENSION_ROOT, 
+       {  1, "descriptorTooComplex", ASN1_EXTENSION_ROOT,
                        dissect_h245_NULL },
        {  0, NULL, 0, NULL }
 };
@@ -2136,7 +2161,7 @@ static const value_string RequestMultiplexEntryRejectionDescriptions_cause_vals[
        {  0, NULL }
 };
 static per_choice_t RequestMultiplexEntryRejectionDescriptions_cause_choice[] = {
-       {  0, "unspecifiedCause", EXTENSION_ROOT, 
+       {  0, "unspecifiedCause", ASN1_EXTENSION_ROOT,
                        dissect_h245_NULL },
        {  0, NULL, 0, NULL }
 };
@@ -2157,11 +2182,11 @@ static const value_string RequestModeReject_cause_vals[] = {
        {  0, NULL }
 };
 static per_choice_t RequestModeReject_cause_choice[] = {
-       {  0, "modeUnavailable", EXTENSION_ROOT, 
+       {  0, "modeUnavailable", ASN1_EXTENSION_ROOT,
                        dissect_h245_NULL },
-       {  1, "multipointConstraint", EXTENSION_ROOT, 
+       {  1, "multipointConstraint", ASN1_EXTENSION_ROOT,
                        dissect_h245_NULL },
-       {  2, "requestDenied", EXTENSION_ROOT, 
+       {  2, "requestDenied", ASN1_EXTENSION_ROOT,
                        dissect_h245_NULL },
        {  0, NULL, 0, NULL }
 };
@@ -2182,9 +2207,9 @@ static const value_string V76ModeParameters_vals[] = {
        {  0, NULL }
 };
 static per_choice_t V76ModeParameters_choice[] = {
-       {  0, "suspendResumewAddress", EXTENSION_ROOT, 
+       {  0, "suspendResumewAddress", ASN1_EXTENSION_ROOT,
                        dissect_h245_NULL },
-       {  1, "suspendResumewoAddress", EXTENSION_ROOT, 
+       {  1, "suspendResumewoAddress", ASN1_EXTENSION_ROOT,
                        dissect_h245_NULL },
        {  0, NULL, 0, NULL }
 };
@@ -2213,27 +2238,27 @@ static const value_string H262VideoMode_profileAndLevel_vals[] = {
        {  0, NULL }
 };
 static per_choice_t H262VideoMode_profileAndLevel_choice[] = {
-       {  0, "profileAndLevel-SPatML", EXTENSION_ROOT, 
+       {  0, "profileAndLevel-SPatML", ASN1_EXTENSION_ROOT,
                        dissect_h245_NULL },
-       {  1, "profileAndLevel-MPatLL", EXTENSION_ROOT, 
+       {  1, "profileAndLevel-MPatLL", ASN1_EXTENSION_ROOT,
                        dissect_h245_NULL },
-       {  2, "profileAndLevel-MPatML", EXTENSION_ROOT, 
+       {  2, "profileAndLevel-MPatML", ASN1_EXTENSION_ROOT,
                        dissect_h245_NULL },
-       {  3, "profileAndLevel-MPatH-14", EXTENSION_ROOT, 
+       {  3, "profileAndLevel-MPatH-14", ASN1_EXTENSION_ROOT,
                        dissect_h245_NULL },
-       {  4, "profileAndLevel-MPatHL", EXTENSION_ROOT, 
+       {  4, "profileAndLevel-MPatHL", ASN1_EXTENSION_ROOT,
                        dissect_h245_NULL },
-       {  5, "profileAndLevel-SNRatLL", EXTENSION_ROOT, 
+       {  5, "profileAndLevel-SNRatLL", ASN1_EXTENSION_ROOT,
                        dissect_h245_NULL },
-       {  6, "profileAndLevel-SNRatML", EXTENSION_ROOT, 
+       {  6, "profileAndLevel-SNRatML", ASN1_EXTENSION_ROOT,
                        dissect_h245_NULL },
-       {  7, "profileAndLevel-SpatialH-14", EXTENSION_ROOT, 
+       {  7, "profileAndLevel-SpatialH-14", ASN1_EXTENSION_ROOT,
                        dissect_h245_NULL },
-       {  8, "profileAndLevel-HPatML", EXTENSION_ROOT, 
+       {  8, "profileAndLevel-HPatML", ASN1_EXTENSION_ROOT,
                        dissect_h245_NULL },
-       {  9, "profileAndLevel-HPatH-14", EXTENSION_ROOT, 
+       {  9, "profileAndLevel-HPatH-14", ASN1_EXTENSION_ROOT,
                        dissect_h245_NULL },
-       { 10, "profileAndLevel-HPatHL", EXTENSION_ROOT, 
+       { 10, "profileAndLevel-HPatHL", ASN1_EXTENSION_ROOT,
                        dissect_h245_NULL },
        {  0, NULL, 0, NULL }
 };
@@ -2258,17 +2283,17 @@ static const value_string H263VideoMode_resolution_vals[] = {
        {  0, NULL }
 };
 static per_choice_t H263VideoMode_resolution_choice[] = {
-       {  0, "sqcif", EXTENSION_ROOT, 
+       {  0, "sqcif", ASN1_EXTENSION_ROOT,
                        dissect_h245_NULL },
-       {  1, "qcif", EXTENSION_ROOT, 
+       {  1, "qcif", ASN1_EXTENSION_ROOT,
                        dissect_h245_NULL },
-       {  2, "cif", EXTENSION_ROOT, 
+       {  2, "cif", ASN1_EXTENSION_ROOT,
                        dissect_h245_NULL },
-       {  3, "cif4", EXTENSION_ROOT, 
+       {  3, "cif4", ASN1_EXTENSION_ROOT,
                        dissect_h245_NULL },
-       {  4, "cif16", EXTENSION_ROOT, 
+       {  4, "cif16", ASN1_EXTENSION_ROOT,
                        dissect_h245_NULL },
-       {  5, "custom", NOT_EXTENSION_ROOT, 
+       {  5, "custom", ASN1_NOT_EXTENSION_ROOT,
                        dissect_h245_NULL },
        {  0, NULL, 0, NULL }
 };
@@ -2289,13 +2314,13 @@ static const value_string AudioMode_g7231_vals[] = {
        {  0, NULL }
 };
 static per_choice_t AudioMode_g7231_choice[] = {
-       {  0, "noSilenceSuppressionLowRate", NO_EXTENSIONS, 
+       {  0, "noSilenceSuppressionLowRate", ASN1_NO_EXTENSIONS,
                        dissect_h245_NULL },
-       {  1, "noSilenceSuppressionHighRate", NO_EXTENSIONS, 
+       {  1, "noSilenceSuppressionHighRate", ASN1_NO_EXTENSIONS,
                        dissect_h245_NULL },
-       {  2, "silenceSuppressionLowRate", NO_EXTENSIONS, 
+       {  2, "silenceSuppressionLowRate", ASN1_NO_EXTENSIONS,
                        dissect_h245_NULL },
-       {  3, "silenceSuppressionHighRate", NO_EXTENSIONS, 
+       {  3, "silenceSuppressionHighRate", ASN1_NO_EXTENSIONS,
                        dissect_h245_NULL },
        {  0, NULL, 0, NULL }
 };
@@ -2316,11 +2341,11 @@ static const value_string IS11172AudioMode_audioLayer_vals[] = {
        {  0, NULL }
 };
 static per_choice_t IS11172AudioMode_audioLayer_choice[] = {
-       {  0, "audioLayer1", NO_EXTENSIONS, 
+       {  0, "audioLayer1", ASN1_NO_EXTENSIONS,
                        dissect_h245_NULL },
-       {  1, "audioLayer2", NO_EXTENSIONS, 
+       {  1, "audioLayer2", ASN1_NO_EXTENSIONS,
                        dissect_h245_NULL },
-       {  2, "audioLayer3", NO_EXTENSIONS, 
+       {  2, "audioLayer3", ASN1_NO_EXTENSIONS,
                        dissect_h245_NULL },
        {  0, NULL, 0, NULL }
 };
@@ -2341,11 +2366,11 @@ static const value_string IS11172AudioMode_audioSampling_vals[] = {
        {  0, NULL }
 };
 static per_choice_t IS11172AudioMode_audioSampling_choice[] = {
-       {  0, "audioSampling32k", NO_EXTENSIONS, 
+       {  0, "audioSampling32k", ASN1_NO_EXTENSIONS,
                        dissect_h245_NULL },
-       {  1, "audioSampling44k1", NO_EXTENSIONS, 
+       {  1, "audioSampling44k1", ASN1_NO_EXTENSIONS,
                        dissect_h245_NULL },
-       {  2, "audioSampling48k", NO_EXTENSIONS, 
+       {  2, "audioSampling48k", ASN1_NO_EXTENSIONS,
                        dissect_h245_NULL },
        {  0, NULL, 0, NULL }
 };
@@ -2366,11 +2391,11 @@ static const value_string IS11172AudioMode_multichannelType_vals[] = {
        {  0, NULL }
 };
 static per_choice_t IS11172AudioMode_multichannelType_choice[] = {
-       {  0, "singleChannel", NO_EXTENSIONS, 
+       {  0, "singleChannel", ASN1_NO_EXTENSIONS,
                        dissect_h245_NULL },
-       {  1, "twoChannelStereo", NO_EXTENSIONS, 
+       {  1, "twoChannelStereo", ASN1_NO_EXTENSIONS,
                        dissect_h245_NULL },
-       {  2, "twoChannelDual", NO_EXTENSIONS, 
+       {  2, "twoChannelDual", ASN1_NO_EXTENSIONS,
                        dissect_h245_NULL },
        {  0, NULL, 0, NULL }
 };
@@ -2392,11 +2417,11 @@ static const value_string IS13818AudioMode_audioLayer_vals[] = {
        {  0, NULL }
 };
 static per_choice_t IS13818AudioMode_audioLayer_choice[] = {
-       {  0, "audioLayer1", NO_EXTENSIONS, 
+       {  0, "audioLayer1", ASN1_NO_EXTENSIONS,
                        dissect_h245_NULL },
-       {  1, "audioLayer2", NO_EXTENSIONS, 
+       {  1, "audioLayer2", ASN1_NO_EXTENSIONS,
                        dissect_h245_NULL },
-       {  2, "audioLayer3", NO_EXTENSIONS, 
+       {  2, "audioLayer3", ASN1_NO_EXTENSIONS,
                        dissect_h245_NULL },
        {  0, NULL, 0, NULL }
 };
@@ -2421,17 +2446,17 @@ static const value_string IS13818AudioMode_audioSampling_vals[] = {
        {  0, NULL }
 };
 static per_choice_t IS13818AudioMode_audioSampling_choice[] = {
-       {  0, "audioSampling16k", NO_EXTENSIONS, 
+       {  0, "audioSampling16k", ASN1_NO_EXTENSIONS,
                        dissect_h245_NULL },
-       {  1, "audioSampling22k05", NO_EXTENSIONS, 
+       {  1, "audioSampling22k05", ASN1_NO_EXTENSIONS,
                        dissect_h245_NULL },
-       {  2, "audioSampling24k", NO_EXTENSIONS, 
+       {  2, "audioSampling24k", ASN1_NO_EXTENSIONS,
                        dissect_h245_NULL },
-       {  3, "audioSampling32k", NO_EXTENSIONS, 
+       {  3, "audioSampling32k", ASN1_NO_EXTENSIONS,
                        dissect_h245_NULL },
-       {  4, "audioSampling44k1", NO_EXTENSIONS, 
+       {  4, "audioSampling44k1", ASN1_NO_EXTENSIONS,
                        dissect_h245_NULL },
-       {  5, "audioSampling48k", NO_EXTENSIONS, 
+       {  5, "audioSampling48k", ASN1_NO_EXTENSIONS,
                        dissect_h245_NULL },
        {  0, NULL, 0, NULL }
 };
@@ -2460,25 +2485,25 @@ static const value_string IS13818AudioMode_multiChannelType_vals[] = {
        {  0, NULL }
 };
 static per_choice_t IS13818AudioMode_multiChannelType_choice[] = {
-       {  0, "singleChannel", NO_EXTENSIONS, 
+       {  0, "singleChannel", ASN1_NO_EXTENSIONS,
                        dissect_h245_NULL },
-       {  1, "twoChannelStereo", NO_EXTENSIONS, 
+       {  1, "twoChannelStereo", ASN1_NO_EXTENSIONS,
                        dissect_h245_NULL },
-       {  2, "twoChannelDual", NO_EXTENSIONS, 
+       {  2, "twoChannelDual", ASN1_NO_EXTENSIONS,
                        dissect_h245_NULL },
-       {  3, "threeChannels2-1", NO_EXTENSIONS, 
+       {  3, "threeChannels2-1", ASN1_NO_EXTENSIONS,
                        dissect_h245_NULL },
-       {  4, "threeChannels3-0", NO_EXTENSIONS, 
+       {  4, "threeChannels3-0", ASN1_NO_EXTENSIONS,
                        dissect_h245_NULL },
-       {  5, "fourChannels2-0-2-0", NO_EXTENSIONS, 
+       {  5, "fourChannels2-0-2-0", ASN1_NO_EXTENSIONS,
                        dissect_h245_NULL },
-       {  6, "fourChannels2-2", NO_EXTENSIONS, 
+       {  6, "fourChannels2-2", ASN1_NO_EXTENSIONS,
                        dissect_h245_NULL },
-       {  7, "fourChannels3-1", NO_EXTENSIONS, 
+       {  7, "fourChannels3-1", ASN1_NO_EXTENSIONS,
                        dissect_h245_NULL },
-       {  8, "fiveChannels3-0-2-0", NO_EXTENSIONS, 
+       {  8, "fiveChannels3-0-2-0", ASN1_NO_EXTENSIONS,
                        dissect_h245_NULL },
-       {  9, "fiveChannels3-2", NO_EXTENSIONS, 
+       {  9, "fiveChannels3-2", ASN1_NO_EXTENSIONS,
                        dissect_h245_NULL },
        {  0, NULL, 0, NULL }
 };
@@ -2498,7 +2523,7 @@ static const value_string MaintenanceLoopReject_cause_vals[] = {
        {  0, NULL }
 };
 static per_choice_t MaintenanceLoopReject_cause_choice[] = {
-       {  0, "canNotPerformLoop", EXTENSION_ROOT, 
+       {  0, "canNotPerformLoop", ASN1_EXTENSION_ROOT,
                        dissect_h245_NULL },
        {  0, NULL, 0, NULL }
 };
@@ -2519,9 +2544,9 @@ static const value_string ConferenceResponse_makeMeChairResponse_vals[] = {
        {  0, NULL }
 };
 static per_choice_t ConferenceResponse_makeMeChairResponse_choice[] = {
-       {  0, "grantedChairToken", EXTENSION_ROOT, 
+       {  0, "grantedChairToken", ASN1_EXTENSION_ROOT,
                        dissect_h245_NULL },
-       {  1, "deniedChairToken", EXTENSION_ROOT, 
+       {  1, "deniedChairToken", ASN1_EXTENSION_ROOT,
                        dissect_h245_NULL },
        {  0, NULL, 0, NULL }
 };
@@ -2542,9 +2567,9 @@ static const value_string ConferenceResponse_broadcastMyLogicalChannelResponse_v
        {  0, NULL }
 };
 static per_choice_t ConferenceResponse_broadcastMyLogicalChannelResponse_choice[] = {
-       {  0, "grantedBroadcastMyLogicalChannel", EXTENSION_ROOT, 
+       {  0, "grantedBroadcastMyLogicalChannel", ASN1_EXTENSION_ROOT,
                        dissect_h245_NULL },
-       {  1, "deniedBroadcastMyLogicalChannel", EXTENSION_ROOT, 
+       {  1, "deniedBroadcastMyLogicalChannel", ASN1_EXTENSION_ROOT,
                        dissect_h245_NULL },
        {  0, NULL, 0, NULL }
 };
@@ -2564,9 +2589,9 @@ static const value_string ConferenceResponse_makeTerminalBroadcasterResponse_val
        {  0, NULL }
 };
 static per_choice_t ConferenceResponse_makeTerminalBroadcasterResponse_choice[] = {
-       {  0, "grantedMakeTerminalBroadcaster", EXTENSION_ROOT, 
+       {  0, "grantedMakeTerminalBroadcaster", ASN1_EXTENSION_ROOT,
                        dissect_h245_NULL },
-       {  1, "deniedMakeTerminalBroadcaster", EXTENSION_ROOT, 
+       {  1, "deniedMakeTerminalBroadcaster", ASN1_EXTENSION_ROOT,
                        dissect_h245_NULL },
        {  0, NULL, 0, NULL }
 };
@@ -2587,9 +2612,9 @@ static const value_string ConferenceResponse_sendThisSourceResponse_vals[] = {
        {  0, NULL }
 };
 static per_choice_t ConferenceResponse_sendThisSourceResponse_choice[] = {
-       {  0, "grantedSendThisSource", EXTENSION_ROOT, 
+       {  0, "grantedSendThisSource", ASN1_EXTENSION_ROOT,
                        dissect_h245_NULL },
-       {  1, "deniedSendThisSource", EXTENSION_ROOT, 
+       {  1, "deniedSendThisSource", ASN1_EXTENSION_ROOT,
                        dissect_h245_NULL },
        {  0, NULL, 0, NULL }
 };
@@ -2610,11 +2635,11 @@ static const value_string RemoteMCRequest_vals[] = {
        {  0, NULL }
 };
 static per_choice_t RemoteMCRequest_choice[] = {
-       {  0, "masterActivate", EXTENSION_ROOT, 
+       {  0, "masterActivate", ASN1_EXTENSION_ROOT,
                        dissect_h245_NULL },
-       {  1, "slaveActivate", EXTENSION_ROOT, 
+       {  1, "slaveActivate", ASN1_EXTENSION_ROOT,
                        dissect_h245_NULL },
-       {  2, "deActivate", EXTENSION_ROOT, 
+       {  2, "deActivate", ASN1_EXTENSION_ROOT,
                        dissect_h245_NULL },
        {  0, NULL, 0, NULL }
 };
@@ -2635,9 +2660,9 @@ static const value_string RemoteMCResponse_reject_vals[] = {
        {  0, NULL }
 };
 static per_choice_t RemoteMCResponse_reject_choice[] = {
-       {  0, "unspecified", EXTENSION_ROOT, 
+       {  0, "unspecified", ASN1_EXTENSION_ROOT,
                        dissect_h245_NULL },
-       {  1, "functionNotSupported", EXTENSION_ROOT, 
+       {  1, "functionNotSupported", ASN1_EXTENSION_ROOT,
                        dissect_h245_NULL },
        {  0, NULL, 0, NULL }
 };
@@ -2658,9 +2683,9 @@ static const value_string RemoteMCResponse_vals[] = {
        {  0, NULL }
 };
 static per_choice_t RemoteMCResponse_choice[] = {
-       {  0, "accept", EXTENSION_ROOT, 
+       {  0, "accept", ASN1_EXTENSION_ROOT,
                        dissect_h245_NULL },
-       {  1, "reject", EXTENSION_ROOT, 
+       {  1, "reject", ASN1_EXTENSION_ROOT,
                        dissect_h245_RemoteMCResponse_reject },
        {  0, NULL, 0, NULL }
 };
@@ -2681,9 +2706,9 @@ static const value_string MultilinkResponse_addConnection_responseCode_rejected_
        {  0, NULL }
 };
 static per_choice_t MultilinkResponse_addConnection_responseCode_rejected_choice[] = {
-       {  0, "connectionNotAvailable", EXTENSION_ROOT, 
+       {  0, "connectionNotAvailable", ASN1_EXTENSION_ROOT,
                        dissect_h245_NULL },
-       {  1, "userRejected", EXTENSION_ROOT, 
+       {  1, "userRejected", ASN1_EXTENSION_ROOT,
                        dissect_h245_NULL },
        {  0, NULL, 0, NULL }
 };
@@ -2703,9 +2728,9 @@ static const value_string MultilinkResponse_addConnection_responseCode_vals[] =
        {  0, NULL }
 };
 static per_choice_t MultilinkResponse_addConnection_responseCode_choice[] = {
-       {  0, "accepted", EXTENSION_ROOT, 
+       {  0, "accepted", ASN1_EXTENSION_ROOT,
                        dissect_h245_NULL },
-       {  1, "rejected", EXTENSION_ROOT, 
+       {  1, "rejected", ASN1_EXTENSION_ROOT,
                        dissect_h245_MultilinkResponse_addConnection_responseCode_rejected },
        {  0, NULL, 0, NULL }
 };
@@ -2725,9 +2750,9 @@ static const value_string LogicalChannelRateRejectReason_vals[] = {
        {  0, NULL }
 };
 static per_choice_t LogicalChannelRateRejectReason_choice[] = {
-       {  0, "undefinedReason", EXTENSION_ROOT, 
+       {  0, "undefinedReason", ASN1_EXTENSION_ROOT,
                        dissect_h245_NULL },
-       {  1, "insufficientResources", EXTENSION_ROOT, 
+       {  1, "insufficientResources", ASN1_EXTENSION_ROOT,
                        dissect_h245_NULL },
        {  0, NULL, 0, NULL }
 };
@@ -2751,15 +2776,15 @@ static const value_string EndSessionCommand_gstnOptions_vals[] = {
        {  0, NULL }
 };
 static per_choice_t EndSessionCommand_gstnOptions_choice[] = {
-       {  0, "telephonyMode", EXTENSION_ROOT, 
+       {  0, "telephonyMode", ASN1_EXTENSION_ROOT,
                        dissect_h245_NULL },
-       {  1, "v8bis", EXTENSION_ROOT, 
+       {  1, "v8bis", ASN1_EXTENSION_ROOT,
                        dissect_h245_NULL },
-       {  2, "v34DSVD", EXTENSION_ROOT, 
+       {  2, "v34DSVD", ASN1_EXTENSION_ROOT,
                        dissect_h245_NULL },
-       {  3, "v34DuplexFax", EXTENSION_ROOT, 
+       {  3, "v34DuplexFax", ASN1_EXTENSION_ROOT,
                        dissect_h245_NULL },
-       {  4, "v34H324", EXTENSION_ROOT, 
+       {  4, "v34H324", ASN1_EXTENSION_ROOT,
                        dissect_h245_NULL },
        {  0, NULL, 0, NULL }
 };
@@ -2781,11 +2806,11 @@ static const value_string EndSessionCommand_isdnOptions_vals[] = {
        {  0, NULL }
 };
 static per_choice_t EndSessionCommand_isdnOptions_choice[] = {
-       {  0, "telephonyMode", EXTENSION_ROOT, 
+       {  0, "telephonyMode", ASN1_EXTENSION_ROOT,
                        dissect_h245_NULL },
-       {  1, "v140", EXTENSION_ROOT, 
+       {  1, "v140", ASN1_EXTENSION_ROOT,
                        dissect_h245_NULL },
-       {  2, "terminalOnHold", EXTENSION_ROOT, 
+       {  2, "terminalOnHold", ASN1_EXTENSION_ROOT,
                        dissect_h245_NULL },
        {  0, NULL, 0, NULL }
 };
@@ -2808,13 +2833,13 @@ static const value_string MiscellaneousCommand_type_progressiveRefinementStart_r
        {  0, NULL }
 };
 static per_choice_t MiscellaneousCommand_type_progressiveRefinementStart_repeatCount_choice[] = {
-       {  0, "doOneProgression", EXTENSION_ROOT, 
+       {  0, "doOneProgression", ASN1_EXTENSION_ROOT,
                        dissect_h245_NULL },
-       {  1, "doContinousProgressions", EXTENSION_ROOT, 
+       {  1, "doContinousProgressions", ASN1_EXTENSION_ROOT,
                        dissect_h245_NULL },
-       {  2, "doOneIndependentProgression", EXTENSION_ROOT, 
+       {  2, "doOneIndependentProgression", ASN1_EXTENSION_ROOT,
                        dissect_h245_NULL },
-       {  3, "doContinousIndependentProgressions", EXTENSION_ROOT, 
+       {  3, "doContinousIndependentProgressions", ASN1_EXTENSION_ROOT,
                        dissect_h245_NULL },
        {  0, NULL, 0, NULL }
 };
@@ -2829,7 +2854,7 @@ dissect_h245_MiscellaneousCommand_type_progressiveRefinementStart_repeatCount(tv
 
 
 static per_sequence_t MiscellaneousCommand_type_progressiveRefinementStart_sequence[] = {
-       { "repeatCount", EXTENSION_ROOT, NOT_OPTIONAL, 
+       { "repeatCount", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_MiscellaneousCommand_type_progressiveRefinementStart_repeatCount },
        { NULL, 0, 0, NULL }
 };
@@ -2852,13 +2877,13 @@ static const value_string H223MultiplexReconfiguration_h223ModeChange_vals[] = {
        {  0, NULL }
 };
 static per_choice_t H223MultiplexReconfiguration_h223ModeChange_choice[] = {
-       {  0, "toLevel0", EXTENSION_ROOT, 
+       {  0, "toLevel0", ASN1_EXTENSION_ROOT,
                        dissect_h245_NULL },
-       {  1, "toLevel1", EXTENSION_ROOT, 
+       {  1, "toLevel1", ASN1_EXTENSION_ROOT,
                        dissect_h245_NULL },
-       {  2, "toLevel2", EXTENSION_ROOT, 
+       {  2, "toLevel2", ASN1_EXTENSION_ROOT,
                        dissect_h245_NULL },
-       {  3, "toLevel2WithOptionalHeader", EXTENSION_ROOT, 
+       {  3, "toLevel2WithOptionalHeader", ASN1_EXTENSION_ROOT,
                        dissect_h245_NULL },
        {  0, NULL, 0, NULL }
 };
@@ -2879,9 +2904,9 @@ static const value_string H223MultiplexReconfiguration_h223AnnexADoubleFlag_vals
        {  0, NULL }
 };
 static per_choice_t H223MultiplexReconfiguration_h223AnnexADoubleFlag_choice[] = {
-       {  0, "start", EXTENSION_ROOT, 
+       {  0, "start", ASN1_EXTENSION_ROOT,
                        dissect_h245_NULL },
-       {  1, "stop", EXTENSION_ROOT, 
+       {  1, "stop", ASN1_EXTENSION_ROOT,
                        dissect_h245_NULL },
        {  0, NULL, 0, NULL }
 };
@@ -2902,9 +2927,9 @@ static const value_string H223MultiplexReconfiguration_vals[] = {
        {  0, NULL }
 };
 static per_choice_t H223MultiplexReconfiguration_choice[] = {
-       {  0, "h233ModeChange", EXTENSION_ROOT, 
+       {  0, "h233ModeChange", ASN1_EXTENSION_ROOT,
                        dissect_h245_H223MultiplexReconfiguration_h223ModeChange },
-       {  1, "h223AnnexADoubleFlag", EXTENSION_ROOT, 
+       {  1, "h223AnnexADoubleFlag", ASN1_EXTENSION_ROOT,
                        dissect_h245_H223MultiplexReconfiguration_h223AnnexADoubleFlag },
        {  0, NULL, 0, NULL }
 };
@@ -2926,11 +2951,11 @@ static const value_string NewATMVCCommand_aal_aal1_clockRecovery_vals[] = {
        {  0, NULL }
 };
 static per_choice_t NewATMVCCommand_aal_aal1_clockRecovery_choice[] = {
-       {  0, "nullClockRecovery", EXTENSION_ROOT, 
+       {  0, "nullClockRecovery", ASN1_EXTENSION_ROOT,
                        dissect_h245_NULL },
-       {  1, "srtsClockRecovery", EXTENSION_ROOT, 
+       {  1, "srtsClockRecovery", ASN1_EXTENSION_ROOT,
                        dissect_h245_NULL },
-       {  2, "adaptiveClockRecovery", EXTENSION_ROOT, 
+       {  2, "adaptiveClockRecovery", ASN1_EXTENSION_ROOT,
                        dissect_h245_NULL },
        {  0, NULL, 0, NULL }
 };
@@ -2954,13 +2979,13 @@ static const value_string NewATMVCCommand_aal_aal1_errorCorrection_vals[] = {
        {  0, NULL }
 };
 static per_choice_t NewATMVCCommand_aal_aal1_errorCorrection_choice[] = {
-       {  0, "nullErrorCorrection", EXTENSION_ROOT, 
+       {  0, "nullErrorCorrection", ASN1_EXTENSION_ROOT,
                        dissect_h245_NULL },
-       {  1, "longInterleaver", EXTENSION_ROOT, 
+       {  1, "longInterleaver", ASN1_EXTENSION_ROOT,
                        dissect_h245_NULL },
-       {  2, "shortInterleaver", EXTENSION_ROOT, 
+       {  2, "shortInterleaver", ASN1_EXTENSION_ROOT,
                        dissect_h245_NULL },
-       {  3, "errorCorrectionOnly", EXTENSION_ROOT, 
+       {  3, "errorCorrectionOnly", ASN1_EXTENSION_ROOT,
                        dissect_h245_NULL },
        {  0, NULL, 0, NULL }
 };
@@ -2982,11 +3007,11 @@ static const value_string NewATMVCCommand_multiplex_vals[] = {
        {  0, NULL }
 };
 static per_choice_t NewATMVCCommand_multiplex_choice[] = {
-       {  0, "noMultiplex", EXTENSION_ROOT, 
+       {  0, "noMultiplex", ASN1_EXTENSION_ROOT,
                        dissect_h245_NULL },
-       {  1, "transportStream", EXTENSION_ROOT, 
+       {  1, "transportStream", ASN1_EXTENSION_ROOT,
                        dissect_h245_NULL },
-       {  2, "programStream", EXTENSION_ROOT, 
+       {  2, "programStream", ASN1_EXTENSION_ROOT,
                        dissect_h245_NULL },
        {  0, NULL, 0, NULL }
 };
@@ -3008,11 +3033,11 @@ static const value_string NewATMVCCommand_reverseParameters_multiplex_vals[] = {
        {  0, NULL }
 };
 static per_choice_t NewATMVCCommand_reverseParameters_multiplex_choice[] = {
-       {  0, "noMultiplex", EXTENSION_ROOT, 
+       {  0, "noMultiplex", ASN1_EXTENSION_ROOT,
                        dissect_h245_NULL },
-       {  1, "transportStream", EXTENSION_ROOT, 
+       {  1, "transportStream", ASN1_EXTENSION_ROOT,
                        dissect_h245_NULL },
-       {  2, "programStream", EXTENSION_ROOT, 
+       {  2, "programStream", ASN1_EXTENSION_ROOT,
                        dissect_h245_NULL },
        {  0, NULL, 0, NULL }
 };
@@ -3032,9 +3057,9 @@ static const value_string MobileMultilinkReconfigurationCommand_status_vals[] =
        {  0, NULL }
 };
 static per_choice_t MobileMultilinkReconfigurationCommand_status_choice[] = {
-       {  0, "synchronized", EXTENSION_ROOT, 
+       {  0, "synchronized", ASN1_EXTENSION_ROOT,
                        dissect_h245_NULL },
-       {  1, "reconfiguration", EXTENSION_ROOT, 
+       {  1, "reconfiguration", ASN1_EXTENSION_ROOT,
                        dissect_h245_NULL },
        {  0, NULL, 0, NULL }
 };
@@ -3056,11 +3081,11 @@ static const value_string FunctionNotSupported_cause_vals[] = {
        {  0, NULL }
 };
 static per_choice_t FunctionNotSupported_cause_choice[] = {
-       {  0, "syntaxError", EXTENSION_ROOT, 
+       {  0, "syntaxError", ASN1_EXTENSION_ROOT,
                        dissect_h245_NULL },
-       {  1, "semanticError", EXTENSION_ROOT, 
+       {  1, "semanticError", ASN1_EXTENSION_ROOT,
                        dissect_h245_NULL },
-       {  2, "unknownFunction", EXTENSION_ROOT, 
+       {  2, "unknownFunction", ASN1_EXTENSION_ROOT,
                        dissect_h245_NULL },
        {  0, NULL, 0, NULL }
 };
@@ -3082,11 +3107,11 @@ static const value_string NewATMVCIndication_aal_aal1_clockRecovery_vals[] = {
        {  0, NULL }
 };
 static per_choice_t NewATMVCIndication_aal_aal1_clockRecovery_choice[] = {
-       {  0, "nullClockRecovery", EXTENSION_ROOT, 
+       {  0, "nullClockRecovery", ASN1_EXTENSION_ROOT,
                        dissect_h245_NULL },
-       {  1, "srtsClockRecovery", EXTENSION_ROOT, 
+       {  1, "srtsClockRecovery", ASN1_EXTENSION_ROOT,
                        dissect_h245_NULL },
-       {  2, "adaptiveClockRecovery", EXTENSION_ROOT, 
+       {  2, "adaptiveClockRecovery", ASN1_EXTENSION_ROOT,
                        dissect_h245_NULL },
        {  0, NULL, 0, NULL }
 };
@@ -3108,13 +3133,13 @@ static const value_string NewATMVCIndication_aal_aal1_errorCorrection_vals[] = {
        {  0, NULL }
 };
 static per_choice_t NewATMVCIndication_aal_aal1_errorCorrection_choice[] = {
-       {  0, "nullErrorCorrection", EXTENSION_ROOT, 
+       {  0, "nullErrorCorrection", ASN1_EXTENSION_ROOT,
                        dissect_h245_NULL },
-       {  1, "longInterleaver", EXTENSION_ROOT, 
+       {  1, "longInterleaver", ASN1_EXTENSION_ROOT,
                        dissect_h245_NULL },
-       {  2, "shortInterleaver", EXTENSION_ROOT, 
+       {  2, "shortInterleaver", ASN1_EXTENSION_ROOT,
                        dissect_h245_NULL },
-       {  3, "errorCorrectionOnly", EXTENSION_ROOT, 
+       {  3, "errorCorrectionOnly", ASN1_EXTENSION_ROOT,
                        dissect_h245_NULL },
        {  0, NULL, 0, NULL }
 };
@@ -3136,11 +3161,11 @@ static const value_string NewATMVCIndication_multiplex_vals[] = {
        {  0, NULL }
 };
 static per_choice_t NewATMVCIndication_multiplex_choice[] = {
-       {  0, "noMultiplex", EXTENSION_ROOT, 
+       {  0, "noMultiplex", ASN1_EXTENSION_ROOT,
                        dissect_h245_NULL },
-       {  1, "transportStream", EXTENSION_ROOT, 
+       {  1, "transportStream", ASN1_EXTENSION_ROOT,
                        dissect_h245_NULL },
-       {  2, "programStream", EXTENSION_ROOT, 
+       {  2, "programStream", ASN1_EXTENSION_ROOT,
                        dissect_h245_NULL },
        {  0, NULL, 0, NULL }
 };
@@ -3162,11 +3187,11 @@ static const value_string NewATMVCIndication_reverseParameters_multiplex_vals[]
        {  0, NULL }
 };
 static per_choice_t NewATMVCIndication_reverseParameters_multiplex_choice[] = {
-       {  0, "noMultiplex", EXTENSION_ROOT, 
+       {  0, "noMultiplex", ASN1_EXTENSION_ROOT,
                        dissect_h245_NULL },
-       {  1, "transportStream", EXTENSION_ROOT, 
+       {  1, "transportStream", ASN1_EXTENSION_ROOT,
                        dissect_h245_NULL },
-       {  2, "programStream", EXTENSION_ROOT, 
+       {  2, "programStream", ASN1_EXTENSION_ROOT,
                        dissect_h245_NULL },
        {  0, NULL, 0, NULL }
 };
@@ -3183,8 +3208,8 @@ dissect_h245_NewATMVCIndication_reverseParameters_multiplex(tvbuff_t *tvb, int o
 static int
 dissect_h245_LogicalChannelNumber(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree)
 {
-       offset=dissect_per_constrained_integer(tvb, offset, pinfo, 
-               tree, hf_h245_LogicalChannelNumber, 1, 65535, 
+       offset=dissect_per_constrained_integer(tvb, offset, pinfo,
+               tree, hf_h245_LogicalChannelNumber, 1, 65535,
                NULL, NULL, FALSE);
        return offset;
 }
@@ -3192,8 +3217,8 @@ dissect_h245_LogicalChannelNumber(tvbuff_t *tvb, int offset, packet_info *pinfo,
 static int
 dissect_h245_logicalChannelNumber(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree)
 {
-       offset=dissect_per_constrained_integer(tvb, offset, pinfo, 
-               tree, hf_h245_LogicalChannelNumber, 0, 65535, 
+       offset=dissect_per_constrained_integer(tvb, offset, pinfo,
+               tree, hf_h245_LogicalChannelNumber, 0, 65535,
                NULL, NULL, FALSE);
        return offset;
 }
@@ -3202,8 +3227,8 @@ dissect_h245_logicalChannelNumber(tvbuff_t *tvb, int offset, packet_info *pinfo,
 static int
 dissect_h245_SequenceNumber(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree)
 {
-       offset=dissect_per_constrained_integer(tvb, offset, pinfo, 
-               tree, hf_h245_SequenceNumber, 0, 255, 
+       offset=dissect_per_constrained_integer(tvb, offset, pinfo,
+               tree, hf_h245_SequenceNumber, 0, 255,
                NULL, NULL, FALSE);
        return offset;
 }
@@ -3218,11 +3243,11 @@ static const value_string MaintenanceLoopRequest_type_vals[] = {
        {  0, NULL }
 };
 static per_choice_t MaintenanceLoopRequest_type_choice[] = {
-       {  0, "systemLoop", EXTENSION_ROOT, 
+       {  0, "systemLoop", ASN1_EXTENSION_ROOT,
                        dissect_h245_NULL },
-       {  1, "mediaLoop", EXTENSION_ROOT, 
+       {  1, "mediaLoop", ASN1_EXTENSION_ROOT,
                        dissect_h245_LogicalChannelNumber },
-       {  2, "logicalChannelLoop", EXTENSION_ROOT, 
+       {  2, "logicalChannelLoop", ASN1_EXTENSION_ROOT,
                        dissect_h245_LogicalChannelNumber },
        {  0, NULL, 0, NULL }
 };
@@ -3244,11 +3269,11 @@ static const value_string MaintenanceLoopAck_type_vals[] = {
        {  0, NULL }
 };
 static per_choice_t MaintenanceLoopAck_type_choice[] = {
-       {  0, "systemLoop", EXTENSION_ROOT, 
+       {  0, "systemLoop", ASN1_EXTENSION_ROOT,
                        dissect_h245_NULL },
-       {  1, "mediaLoop", EXTENSION_ROOT, 
+       {  1, "mediaLoop", ASN1_EXTENSION_ROOT,
                        dissect_h245_LogicalChannelNumber },
-       {  2, "logicalChannelLoop", EXTENSION_ROOT, 
+       {  2, "logicalChannelLoop", ASN1_EXTENSION_ROOT,
                        dissect_h245_LogicalChannelNumber },
        {  0, NULL, 0, NULL }
 };
@@ -3270,11 +3295,11 @@ static const value_string MaintenanceLoopReject_type_vals[] = {
        {  0, NULL }
 };
 static per_choice_t MaintenanceLoopReject_type_choice[] = {
-       {  0, "systemLoop", EXTENSION_ROOT, 
+       {  0, "systemLoop", ASN1_EXTENSION_ROOT,
                        dissect_h245_NULL },
-       {  1, "mediaLoop", EXTENSION_ROOT, 
+       {  1, "mediaLoop", ASN1_EXTENSION_ROOT,
                        dissect_h245_LogicalChannelNumber },
-       {  2, "logicalChannelLoop", EXTENSION_ROOT, 
+       {  2, "logicalChannelLoop", ASN1_EXTENSION_ROOT,
                        dissect_h245_LogicalChannelNumber },
        {  0, NULL, 0, NULL }
 };
@@ -3290,9 +3315,9 @@ dissect_h245_MaintenanceLoopReject_type(tvbuff_t *tvb, int offset, packet_info *
 
 
 static per_sequence_t OpenLogicalChannelReject_sequence[] = {
-       { "forwardLogicalChannelNumber", EXTENSION_ROOT, NOT_OPTIONAL, 
+       { "forwardLogicalChannelNumber", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_LogicalChannelNumber },
-       { "cause", EXTENSION_ROOT, NOT_OPTIONAL, 
+       { "cause", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_OpenLogicalChannelReject_cause },
        { NULL, 0, 0, NULL }
 };
@@ -3308,11 +3333,11 @@ dissect_h245_OpenLogicalChannelReject(tvbuff_t *tvb, int offset, packet_info *pi
 
 
 static per_sequence_t CloseLogicalChannel_sequence[] = {
-       { "forwardLogicalChannelNumber", EXTENSION_ROOT, NOT_OPTIONAL, 
+       { "forwardLogicalChannelNumber", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_LogicalChannelNumber },
-       { "source", EXTENSION_ROOT, NOT_OPTIONAL, 
+       { "source", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_CloseLogicalChannel_source },
-       { "reason", NOT_EXTENSION_ROOT, NOT_OPTIONAL, 
+       { "reason", ASN1_NOT_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_CloseLogicalChannel_reason },
        { NULL, 0, 0, NULL }
 };
@@ -3328,7 +3353,7 @@ dissect_h245_CloseLogicalChannel(tvbuff_t *tvb, int offset, packet_info *pinfo,
 
 
 static per_sequence_t CloseLogicalChannelAck_sequence[] = {
-       { "forwardLogicalChannelNumber", EXTENSION_ROOT, NOT_OPTIONAL, 
+       { "forwardLogicalChannelNumber", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_LogicalChannelNumber },
        { NULL, 0, 0, NULL }
 };
@@ -3344,7 +3369,7 @@ dissect_h245_CloseLogicalChannelAck(tvbuff_t *tvb, int offset, packet_info *pinf
 
 
 static per_sequence_t RequestChannelCloseAck_sequence[] = {
-       { "forwardLogiclChannelNumber", EXTENSION_ROOT, NOT_OPTIONAL, 
+       { "forwardLogiclChannelNumber", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_LogicalChannelNumber },
        { NULL, 0, 0, NULL }
 };
@@ -3360,9 +3385,9 @@ dissect_h245_RequestChannelCloseAck(tvbuff_t *tvb, int offset, packet_info *pinf
 
 
 static per_sequence_t RequestChannelCloseReject_sequence[] = {
-       { "forwardLogicalChannelNumber", EXTENSION_ROOT, NOT_OPTIONAL, 
+       { "forwardLogicalChannelNumber", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_LogicalChannelNumber },
-       { "cause", EXTENSION_ROOT, NOT_OPTIONAL, 
+       { "cause", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_RequestChannelCloseReject_cause },
        { NULL, 0, 0, NULL }
 };
@@ -3378,7 +3403,7 @@ dissect_h245_RequestChannelCloseReject(tvbuff_t *tvb, int offset, packet_info *p
 
 
 static per_sequence_t RequestChannelCloseRelease_sequence[] = {
-       { "forwardLogicalChannelNumber", EXTENSION_ROOT, NOT_OPTIONAL, 
+       { "forwardLogicalChannelNumber", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_LogicalChannelNumber },
        { NULL, 0, 0, NULL }
 };
@@ -3395,7 +3420,7 @@ dissect_h245_RequestChannelCloseRelease(tvbuff_t *tvb, int offset, packet_info *
 
 
 static per_sequence_t MultiplexedStreamModeParameters_sequence[] = {
-       { "logicalChannelNumber", EXTENSION_ROOT, NOT_OPTIONAL, 
+       { "logicalChannelNumber", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_LogicalChannelNumber },
        { NULL, 0, 0, NULL }
 };
@@ -3411,7 +3436,7 @@ dissect_h245_MultiplexedStreamModeParameters(tvbuff_t *tvb, int offset, packet_i
 
 
 static per_sequence_t MaintenanceLoopRequest_sequence[] = {
-       { "type", EXTENSION_ROOT, NOT_OPTIONAL, 
+       { "type", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_MaintenanceLoopRequest_type },
        { NULL, 0, 0, NULL }
 };
@@ -3427,7 +3452,7 @@ dissect_h245_MaintenanceLoopRequest(tvbuff_t *tvb, int offset, packet_info *pinf
 
 
 static per_sequence_t MaintenanceLoopAck_sequence[] = {
-       { "type", EXTENSION_ROOT, NOT_OPTIONAL, 
+       { "type", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_MaintenanceLoopAck_type },
        { NULL, 0, 0, NULL }
 };
@@ -3442,9 +3467,9 @@ dissect_h245_MaintenanceLoopAck(tvbuff_t *tvb, int offset, packet_info *pinfo, p
 
 
 static per_sequence_t MaintenanceLoopReject_sequence[] = {
-       { "type", EXTENSION_ROOT, NOT_OPTIONAL, 
+       { "type", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                        dissect_h245_MaintenanceLoopReject_type },
-       { "cause", EXTENSION_ROOT, NOT_OPTIONAL, 
+       { "cause", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                        dissect_h245_MaintenanceLoopReject_cause },
        { NULL, 0, 0, NULL }
 };
@@ -3459,7 +3484,7 @@ dissect_h245_MaintenanceLoopReject(tvbuff_t *tvb, int offset, packet_info *pinfo
 
 
 static per_sequence_t UserInputIndication_signalUpdate_rtp_sequence[] = {
-       { "logicalChannelNumber", EXTENSION_ROOT, NOT_OPTIONAL, 
+       { "logicalChannelNumber", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                        dissect_h245_LogicalChannelNumber },
        { NULL, 0, 0, NULL }
 };
@@ -3474,7 +3499,7 @@ dissect_h245_UserInputIndication_signalUpdate_rtp(tvbuff_t *tvb, int offset, pac
 
 
 static per_sequence_t OpenLogicalChannelConfirm_sequence[] = {
-       { "forwardLogicalChannelNumber",        EXTENSION_ROOT, NOT_OPTIONAL, 
+       { "forwardLogicalChannelNumber",        ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                        dissect_h245_LogicalChannelNumber },
        { NULL, 0, 0, NULL }
 };
@@ -3489,7 +3514,7 @@ dissect_h245_OpenLogicalChannelConfirm(tvbuff_t *tvb, int offset, packet_info *p
 
 
 static per_sequence_t TerminalCapabilitySetAck_sequence[] = {
-       { "sequenceNumber", EXTENSION_ROOT, NOT_OPTIONAL, 
+       { "sequenceNumber", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_SequenceNumber },
        { NULL, 0, 0, NULL }
 };
@@ -3504,9 +3529,9 @@ dissect_h245_TerminalCapabilitySetAck(tvbuff_t *tvb, int offset, packet_info *pi
 
 
 static per_sequence_t RequestModeReject_sequence[] = {
-       { "sequenceNumber", EXTENSION_ROOT, NOT_OPTIONAL, 
+       { "sequenceNumber", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_SequenceNumber },
-       { "cause", EXTENSION_ROOT, NOT_OPTIONAL, 
+       { "cause", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_RequestModeReject_cause },
        { NULL, 0, 0, NULL }
 };
@@ -3522,7 +3547,7 @@ dissect_h245_RequestModeReject(tvbuff_t *tvb, int offset, packet_info *pinfo, pr
 
 
 static per_sequence_t RoundTripDelayRequest_sequence[] = {
-       { "sequenceNumber", EXTENSION_ROOT, NOT_OPTIONAL, 
+       { "sequenceNumber", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_SequenceNumber },
        { NULL, 0, 0, NULL }
 };
@@ -3538,7 +3563,7 @@ dissect_h245_RoundTripDelayRequest(tvbuff_t *tvb, int offset, packet_info *pinfo
 
 
 static per_sequence_t RoundTripDelayResponse_sequence[] = {
-       { "sequenceNumber", EXTENSION_ROOT, NOT_OPTIONAL, 
+       { "sequenceNumber", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_SequenceNumber },
        { NULL, 0, 0, NULL }
 };
@@ -3553,9 +3578,9 @@ dissect_h245_RoundTripDelayResponse(tvbuff_t *tvb, int offset, packet_info *pinf
 
 
 static per_sequence_t MultilinkResponse_addConnection_sequence[] = {
-       { "sequenceNumber", EXTENSION_ROOT, NOT_OPTIONAL, 
+       { "sequenceNumber", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_SequenceNumber },
-       { "responseCode", EXTENSION_ROOT, NOT_OPTIONAL, 
+       { "responseCode", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_MultilinkResponse_addConnection_responseCode },
        { NULL, 0, 0, NULL }
 };
@@ -3715,23 +3740,23 @@ dissect_h245_partiallyFilledCells(tvbuff_t *tvb, int offset, packet_info *pinfo,
 
 
 static per_sequence_t VCCapability_aal1_sequence[] = {
-       { "nullClockRecovery", EXTENSION_ROOT, NOT_OPTIONAL, 
+       { "nullClockRecovery", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_nullClockRecovery },
-       { "srtsClockRecovery", EXTENSION_ROOT, NOT_OPTIONAL, 
+       { "srtsClockRecovery", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_srtsClockRecovery },
-       { "adaptiveClockRecovery", EXTENSION_ROOT, NOT_OPTIONAL, 
+       { "adaptiveClockRecovery", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_adaptiveClockRecovery },
-       { "nullErrorCorrection", EXTENSION_ROOT, NOT_OPTIONAL, 
+       { "nullErrorCorrection", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_nullErrorCorrection },
-       { "longInterleaver", EXTENSION_ROOT, NOT_OPTIONAL, 
+       { "longInterleaver", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_longInterleaver },
-       { "shortInterleaver", EXTENSION_ROOT, NOT_OPTIONAL, 
+       { "shortInterleaver", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_shortInterleaver },
-       { "errorCorrectionOnly", EXTENSION_ROOT, NOT_OPTIONAL, 
+       { "errorCorrectionOnly", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_errorCorrectionOnly },
-       { "structuredDataTransfer", EXTENSION_ROOT, NOT_OPTIONAL, 
+       { "structuredDataTransfer", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_structuredDataTransfer },
-       { "partiallyFilledCells", EXTENSION_ROOT, NOT_OPTIONAL, 
+       { "partiallyFilledCells", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_partiallyFilledCells },
        { NULL, 0, 0, NULL }
 };
@@ -3748,13 +3773,13 @@ dissect_h245_VCCapability_aal1(tvbuff_t *tvb, int offset, packet_info *pinfo, pr
 
 
 static per_sequence_t NewATMVCCommand_aal_aal1_sequence[] = {
-       { "clockRecovery", EXTENSION_ROOT, NOT_OPTIONAL, 
+       { "clockRecovery", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_NewATMVCCommand_aal_aal1_clockRecovery },
-       { "errorCorrection", EXTENSION_ROOT, NOT_OPTIONAL, 
+       { "errorCorrection", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_NewATMVCCommand_aal_aal1_errorCorrection },
-       { "structuredDataTransfer", EXTENSION_ROOT, NOT_OPTIONAL, 
+       { "structuredDataTransfer", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_structuredDataTransfer },
-       { "partiallyFilledCells", EXTENSION_ROOT, NOT_OPTIONAL, 
+       { "partiallyFilledCells", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_partiallyFilledCells },
        { NULL, 0, 0, NULL }
 };
@@ -3769,13 +3794,13 @@ dissect_h245_NewATMVCCommand_aal_aal1(tvbuff_t *tvb, int offset, packet_info *pi
 
 
 static per_sequence_t NewATMVCIndication_aal_aal1_sequence[] = {
-       { "clockRecovery", EXTENSION_ROOT, NOT_OPTIONAL, 
+       { "clockRecovery", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_NewATMVCIndication_aal_aal1_clockRecovery },
-       { "errorCorrection", EXTENSION_ROOT, NOT_OPTIONAL, 
+       { "errorCorrection", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_NewATMVCIndication_aal_aal1_errorCorrection },
-       { "structuredDataTransfer", EXTENSION_ROOT, NOT_OPTIONAL, 
+       { "structuredDataTransfer", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_structuredDataTransfer },
-       { "partiallyFilledCells", EXTENSION_ROOT, NOT_OPTIONAL, 
+       { "partiallyFilledCells", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_partiallyFilledCells },
        { NULL, 0, 0, NULL }
 };
@@ -4078,15 +4103,15 @@ dissect_h245_h223AnnexBwithHeader(tvbuff_t *tvb, int offset, packet_info *pinfo,
 
 
 static per_sequence_t H223Capability_mobileOperationTransmitCapability_sequence[] = {
-       { "modeChangeCapability", EXTENSION_ROOT, NOT_OPTIONAL, 
+       { "modeChangeCapability", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_modeChangeCapability },
-       { "h223AnnexA", EXTENSION_ROOT, NOT_OPTIONAL, 
+       { "h223AnnexA", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_h223AnnexA },
-       { "h223AnnexADoubleFlag", EXTENSION_ROOT, NOT_OPTIONAL, 
+       { "h223AnnexADoubleFlag", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_h223AnnexADoubleFlag_bool },
-       { "h223AnnexB", EXTENSION_ROOT, NOT_OPTIONAL,
+       { "h223AnnexB", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_h223AnnexB },
-       { "h223AnnexBwithHeader", EXTENSION_ROOT, NOT_OPTIONAL, 
+       { "h223AnnexBwithHeader", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_h223AnnexBwithHeader },
        { NULL, 0, 0, NULL }
 };
@@ -4260,9 +4285,9 @@ dissect_h245_alpduInterleaving(tvbuff_t *tvb, int offset, packet_info *pinfo, pr
 
 
 static per_sequence_t H223AL2MParameters_sequence[] = {
-       { "headerFEC", EXTENSION_ROOT, NOT_OPTIONAL, 
+       { "headerFEC", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_H223AL2MParameters_headerFEC },
-       { "alpduInterleaving", EXTENSION_ROOT, NOT_OPTIONAL, 
+       { "alpduInterleaving", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_alpduInterleaving },
        { NULL, 0, 0, NULL }
 };
@@ -4489,7 +4514,7 @@ dissect_h245_audioHeader(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tr
 
 
 static per_sequence_t V75Capability_sequence[] = {
-       { "audioHeader", EXTENSION_ROOT, NOT_OPTIONAL, 
+       { "audioHeader", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_audioHeader },
        { NULL, 0, 0, NULL }
 };
@@ -4537,9 +4562,9 @@ dissect_h245_decentralizedConferenceMC(tvbuff_t *tvb, int offset, packet_info *p
 
 
 static per_sequence_t H2250Capability_mcCapability_sequence[] = {
-       { "centralizedConferenceMC", EXTENSION_ROOT, NOT_OPTIONAL, 
+       { "centralizedConferenceMC", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_centralizedConferenceMC },
-       { "decentralizedConferenceMC", EXTENSION_ROOT, NOT_OPTIONAL,
+       { "decentralizedConferenceMC", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_decentralizedConferenceMC },
        { NULL, 0, 0, NULL }
 };
@@ -4715,7 +4740,7 @@ dissect_h245_variableDelta(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_
 
 
 static per_sequence_t MediaTransportType_AtmAAL5Compressed_sequence[] = {
-       { "variable-delta", EXTENSION_ROOT, NOT_OPTIONAL, 
+       { "variable-delta", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_variableDelta },
        { NULL, 0, 0, NULL }
 };
@@ -4739,15 +4764,15 @@ static const value_string MediaTransportType_vals[] = {
        {  0, NULL }
 };
 static per_choice_t MediaTransportType_choice[] = {
-       {  0, "ip-UDP", EXTENSION_ROOT, 
+       {  0, "ip-UDP", ASN1_EXTENSION_ROOT,
                        dissect_h245_NULL },
-       {  1, "ip-TCP", EXTENSION_ROOT, 
+       {  1, "ip-TCP", ASN1_EXTENSION_ROOT,
                        dissect_h245_NULL },
-       {  2, "atm-AAL5-UNIDIR", EXTENSION_ROOT, 
+       {  2, "atm-AAL5-UNIDIR", ASN1_EXTENSION_ROOT,
                        dissect_h245_NULL },
-       {  3, "atm-AAL5-BIDIR", EXTENSION_ROOT, 
+       {  3, "atm-AAL5-BIDIR", ASN1_EXTENSION_ROOT,
                        dissect_h245_NULL },
-       {  4, "atm-AAL5-compressed", NOT_EXTENSION_ROOT, 
+       {  4, "atm-AAL5-compressed", ASN1_NOT_EXTENSION_ROOT,
                        dissect_h245_MediaTransportType_AtmAAL5Compressed },
        {  0, NULL, 0, NULL }
 };
@@ -4762,7 +4787,7 @@ dissect_h245_MediaTransportType(tvbuff_t *tvb, int offset, packet_info *pinfo, p
 
 
 static per_sequence_t MediaChannelCapability_sequence[] = {
-       { "mediaTransport", EXTENSION_ROOT, OPTIONAL, 
+       { "mediaTransport", ASN1_EXTENSION_ROOT, ASN1_OPTIONAL,
                dissect_h245_MediaTransportType },
        { NULL, 0, 0, NULL }
 };
@@ -5796,21 +5821,21 @@ dissect_h245_spareReferencePictures(tvbuff_t *tvb, int offset, packet_info *pinf
 
 
 static per_sequence_t H263Version3Options_sequence[] = {
-       { "dataPartitionedSlices", EXTENSION_ROOT, NOT_OPTIONAL, 
+       { "dataPartitionedSlices", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_dataPartitionedSlices },
-       { "fixedPointIDCTO", EXTENSION_ROOT, NOT_OPTIONAL,
+       { "fixedPointIDCTO", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_fixedPointIDCT0 },
-       { "interlacedFields", EXTENSION_ROOT, NOT_OPTIONAL, 
+       { "interlacedFields", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_interlacedFields},
-       { "currentPictureHeaderRepetition", EXTENSION_ROOT, NOT_OPTIONAL, 
+       { "currentPictureHeaderRepetition", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_currentPictureHeaderRepetition },
-       { "previousPictureHeaderRepetition", EXTENSION_ROOT, NOT_OPTIONAL, 
+       { "previousPictureHeaderRepetition", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_previousPictureHeaderRepetition },
-       { "nextPictureHeaderRepetition", EXTENSION_ROOT, NOT_OPTIONAL, 
+       { "nextPictureHeaderRepetition", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_nextPictureHeaderRepetition },
-       { "pictureNumber", EXTENSION_ROOT, NOT_OPTIONAL, 
+       { "pictureNumber", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_pictureNumber_bool },
-       { "spareReferencePictures", EXTENSION_ROOT, NOT_OPTIONAL, 
+       { "spareReferencePictures", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_spareReferencePictures },
        { NULL, 0, 0, NULL }
 };
@@ -5827,51 +5852,51 @@ dissect_h245_H263Version3Options(tvbuff_t *tvb, int offset, packet_info *pinfo,
 
 
 static per_sequence_t H263ModeComboFlags_sequence[] = {
-       { "unrestrictedVector", EXTENSION_ROOT, NOT_OPTIONAL, 
+       { "unrestrictedVector", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_unrestrictedVector },
-       { "arithmeticCoding", EXTENSION_ROOT, NOT_OPTIONAL, 
+       { "arithmeticCoding", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_arithmeticCoding },
-       { "advancedPrediction", EXTENSION_ROOT, NOT_OPTIONAL, 
+       { "advancedPrediction", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_advancedPrediction },
-       { "pbFrames", EXTENSION_ROOT, NOT_OPTIONAL, 
+       { "pbFrames", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_pbFrames },
-       { "advancedIntraCodingMode", EXTENSION_ROOT, NOT_OPTIONAL, 
+       { "advancedIntraCodingMode", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_advancedIntraCodingMode },
-       { "deblockingFilterMode", EXTENSION_ROOT, NOT_OPTIONAL, 
+       { "deblockingFilterMode", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_deblockingFilterMode },
-       { "unlimitedMotionVectors", EXTENSION_ROOT, NOT_OPTIONAL, 
+       { "unlimitedMotionVectors", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_unlimitedMotionVectors },
-       { "slicesInOrder-NonRect", EXTENSION_ROOT, NOT_OPTIONAL, 
+       { "slicesInOrder-NonRect", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_slicesInOrderNonRect },
-       { "slicesInOrder-Rect", EXTENSION_ROOT, NOT_OPTIONAL, 
+       { "slicesInOrder-Rect", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_slicesInOrderRect },
-       { "slicesNoOrder-NonRect", EXTENSION_ROOT, NOT_OPTIONAL,
+       { "slicesNoOrder-NonRect", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_slicesNoOrderNonRect },
-       { "slicesNoOrder-Rect", EXTENSION_ROOT, NOT_OPTIONAL, 
+       { "slicesNoOrder-Rect", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_slicesNoOrderRect },
-       { "improvedPBFramesMode", EXTENSION_ROOT, NOT_OPTIONAL, 
+       { "improvedPBFramesMode", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_improvedPBFramesMode },
-       { "referencePicSelect", EXTENSION_ROOT, NOT_OPTIONAL, 
+       { "referencePicSelect", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_referencePicSelect },
-       { "dynamicPictureResizingByFour", EXTENSION_ROOT, NOT_OPTIONAL, 
+       { "dynamicPictureResizingByFour", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_dynamicPictureResizingByFour },
-       { "dynamicPictureResizingSixteenthPel", EXTENSION_ROOT, NOT_OPTIONAL,
+       { "dynamicPictureResizingSixteenthPel", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_dynamicPictureResizingSixteenthPel },
-       { "dynamicWarpingHalfPel", EXTENSION_ROOT, NOT_OPTIONAL,
+       { "dynamicWarpingHalfPel", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_dynamicWarpingHalfPel },
-       { "dynamicWarpingSixteenthPel", EXTENSION_ROOT, NOT_OPTIONAL,
+       { "dynamicWarpingSixteenthPel", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_dynamicWarpingSixteenthPel },
-       { "reducedResolutionUpdate", EXTENSION_ROOT, NOT_OPTIONAL, 
+       { "reducedResolutionUpdate", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_reducedResolutionUpdate },
-       { "independentSegmentDecoding", EXTENSION_ROOT, NOT_OPTIONAL, 
+       { "independentSegmentDecoding", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_independentSegmentDecoding },
-       { "alternateInterVLCMode", EXTENSION_ROOT, NOT_OPTIONAL, 
+       { "alternateInterVLCMode", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_alternateInterVLCMode },
-       { "modifiedQuantizationMode", EXTENSION_ROOT, NOT_OPTIONAL,
+       { "modifiedQuantizationMode", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_modifiedQuantizationMode },
-       { "enhancedReferencePicSelect", NOT_EXTENSION_ROOT, NOT_OPTIONAL, 
+       { "enhancedReferencePicSelect", ASN1_NOT_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_enhancedReferencePicSelect_bool },
-       { "h263Version3Options", NOT_EXTENSION_ROOT, NOT_OPTIONAL, 
+       { "h263Version3Options", ASN1_NOT_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_H263Version3Options },
        { NULL, 0, 0, NULL }
 };
@@ -6689,43 +6714,43 @@ dissect_h245_digPhotoHighProg(tvbuff_t *tvb, int offset, packet_info *pinfo, pro
 
 
 static per_sequence_t T84Profile_t84Restricted_sequence[] = {
-       { "qcif", EXTENSION_ROOT, NOT_OPTIONAL, 
+       { "qcif", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_qcif_bool },
-       { "cif", EXTENSION_ROOT, NOT_OPTIONAL,
+       { "cif", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_cif_bool },
-       { "ccir601Seq", EXTENSION_ROOT, NOT_OPTIONAL,
+       { "ccir601Seq", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_ccir601Seq },
-       { "ccir601Prog", EXTENSION_ROOT, NOT_OPTIONAL, 
+       { "ccir601Prog", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_ccir601Prog },
-       { "hdtvSeq", EXTENSION_ROOT, NOT_OPTIONAL, 
+       { "hdtvSeq", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_hdtvSeq },
-       { "hdtvProg", EXTENSION_ROOT, NOT_OPTIONAL, 
+       { "hdtvProg", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_hdtvProg },
-       { "g3FacsMH200x100", EXTENSION_ROOT, NOT_OPTIONAL, 
+       { "g3FacsMH200x100", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_g3FacsMH200x100 },
-       { "g3FacsMH200x200", EXTENSION_ROOT, NOT_OPTIONAL, 
+       { "g3FacsMH200x200", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_g3FacsMH200x200 },
-       { "g4FacsMMR200x100", EXTENSION_ROOT, NOT_OPTIONAL, 
+       { "g4FacsMMR200x100", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_g4FacsMMR200x100 },
-       { "g4FacsMMR200x200", EXTENSION_ROOT, NOT_OPTIONAL, 
+       { "g4FacsMMR200x200", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_g4FacsMMR200x200 },
-       { "jbig200x200Seq", EXTENSION_ROOT, NOT_OPTIONAL, 
+       { "jbig200x200Seq", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_jbig200x200Seq },
-       { "jbig200x200Prog", EXTENSION_ROOT, NOT_OPTIONAL, 
+       { "jbig200x200Prog", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_jbig200x200Prog },
-       { "jbig300x300Seq", EXTENSION_ROOT, NOT_OPTIONAL, 
+       { "jbig300x300Seq", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_jbig300x300Seq },
-       { "jbig300x300Prog", EXTENSION_ROOT, NOT_OPTIONAL, 
+       { "jbig300x300Prog", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_jbig300x300Prog },
-       { "digPhotoLow", EXTENSION_ROOT, NOT_OPTIONAL, 
+       { "digPhotoLow", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_digPhotoLow },
-       { "digPhotoMedSeq", EXTENSION_ROOT, NOT_OPTIONAL, 
+       { "digPhotoMedSeq", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_digPhotoMedSeq },
-       { "digPhotoMedProg", EXTENSION_ROOT, NOT_OPTIONAL, 
+       { "digPhotoMedProg", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_digPhotoMedProg },
-       { "digPhotoHighSeq", EXTENSION_ROOT, NOT_OPTIONAL, 
+       { "digPhotoHighSeq", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_digPhotoHighSeq },
-       { "digPhotoHighProg", EXTENSION_ROOT, NOT_OPTIONAL, 
+       { "digPhotoHighProg", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_digPhotoHighProg },
        { NULL, 0, 0, NULL }
 };
@@ -6746,9 +6771,9 @@ static const value_string T84Profile_vals[] = {
        {  0, NULL }
 };
 static per_choice_t T84Profile_choice[] = {
-       {  0, "t84Unrestricted", NO_EXTENSIONS, 
+       {  0, "t84Unrestricted", ASN1_NO_EXTENSIONS,
                        dissect_h245_NULL },
-       {  1, "t84Restricted", NO_EXTENSIONS, 
+       {  1, "t84Restricted", ASN1_NO_EXTENSIONS,
                        dissect_h245_T84Profile_t84Restricted },
        {  0, NULL, 0, NULL }
 };
@@ -6827,7 +6852,7 @@ dissect_h245_t38TCPBidirectionalMode(tvbuff_t *tvb, int offset, packet_info *pin
 
 
 static per_sequence_t T38FaxTcpOptions_sequence[] = {
-       { "t38TCPBidirectionalMode", EXTENSION_ROOT, NOT_OPTIONAL,
+       { "t38TCPBidirectionalMode", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_t38TCPBidirectionalMode },
        { NULL, 0, 0, NULL }
 };
@@ -6956,9 +6981,9 @@ dissect_h245_samePort_bool(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_
 
 
 static per_sequence_t FECCapability_rfc2733_separateStream_sequence[] = {
-       { "separatePort", EXTENSION_ROOT, NOT_OPTIONAL, 
+       { "separatePort", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_separatePort },
-       { "samePort", EXTENSION_ROOT, NOT_OPTIONAL, 
+       { "samePort", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_samePort_bool },
        { NULL, 0, 0, NULL }
 };
@@ -6973,9 +6998,9 @@ dissect_h245_FECCapability_rfc2733_separateStream(tvbuff_t *tvb, int offset, pac
 
 
 static per_sequence_t FECCapability_rfc2733_sequence[] = {
-       { "redundancyEncoding", EXTENSION_ROOT, NOT_OPTIONAL, 
+       { "redundancyEncoding", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_redundancyEncoding_bool },
-       { "separateStream", EXTENSION_ROOT, NOT_OPTIONAL, 
+       { "separateStream", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_FECCapability_rfc2733_separateStream },
        { NULL, 0, 0, NULL }
 };
@@ -6995,7 +7020,7 @@ static const value_string FECCapability_vals[] = {
        {  0, NULL }
 };
 static per_choice_t FECCapability_choice[] = {
-       {  0, "rfc2733", EXTENSION_ROOT, 
+       {  0, "rfc2733", ASN1_EXTENSION_ROOT,
                dissect_h245_FECCapability_rfc2733 },
        {  0, NULL, 0, NULL }
 };
@@ -7042,7 +7067,7 @@ dissect_h245_audioHeaderPresent(tvbuff_t *tvb, int offset, packet_info *pinfo, p
 
 
 static per_sequence_t V75Parameters_sequence[] = {
-       { "audioHeaderPresent", EXTENSION_ROOT, NOT_OPTIONAL,
+       { "audioHeaderPresent", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_audioHeaderPresent },
        { NULL, 0, 0, NULL }
 };
@@ -7239,11 +7264,11 @@ dissect_h245_certProtectedKey(tvbuff_t *tvb, int offset, packet_info *pinfo, pro
 
 
 static per_sequence_t KeyProtectionMethod_sequence[] = {
-       { "secureChannel", EXTENSION_ROOT, NOT_OPTIONAL, 
+       { "secureChannel", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_secureChannel },
-       { "sharedSecret", EXTENSION_ROOT, NOT_OPTIONAL, 
+       { "sharedSecret", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_sharedSecret },
-       { "certProtectedKey", EXTENSION_ROOT, NOT_OPTIONAL,
+       { "certProtectedKey", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_certProtectedKey },
        { NULL, 0, 0, NULL }
 };
@@ -7258,7 +7283,7 @@ dissect_h245_KeyProtectionMethod(tvbuff_t *tvb, int offset, packet_info *pinfo,
 
 
 static per_sequence_t EncryptionUpdateRequest_sequence[] = {
-       { "keyProtectionMethod", EXTENSION_ROOT, OPTIONAL,
+       { "keyProtectionMethod", ASN1_EXTENSION_ROOT, ASN1_OPTIONAL,
                dissect_h245_KeyProtectionMethod },
        { NULL, 0, 0, NULL }
 };
@@ -7308,10 +7333,10 @@ dissect_h245_bitRateLockedToNetworkClock(tvbuff_t *tvb, int offset, packet_info
 static int
 dissect_h245_IS11172_BitRate(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree)
 {
-       offset=dissect_per_constrained_integer(tvb, offset, pinfo, 
-               tree, hf_h245_IS11172_BitRate, 1, 448, 
+       offset=dissect_per_constrained_integer(tvb, offset, pinfo,
+               tree, hf_h245_IS11172_BitRate, 1, 448,
                NULL, NULL, FALSE);
-       
+
        return offset;
 }
 
@@ -7321,33 +7346,33 @@ dissect_h245_IS11172_BitRate(tvbuff_t *tvb, int offset, packet_info *pinfo, prot
 static int
 dissect_h245_IS13818_BitRate(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree)
 {
-       offset=dissect_per_constrained_integer(tvb, offset, pinfo, 
-               tree, hf_h245_IS13818_BitRate, 1, 1130, 
+       offset=dissect_per_constrained_integer(tvb, offset, pinfo,
+               tree, hf_h245_IS13818_BitRate, 1, 1130,
                NULL, NULL, FALSE);
-       
+
        return offset;
 }
 
 
 
 static per_sequence_t IS11172AudioCapability_sequence[] = {
-       { "audioLayer1", EXTENSION_ROOT, NOT_OPTIONAL,
+       { "audioLayer1", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_audioLayer1 },
-       { "audioLayer2", EXTENSION_ROOT, NOT_OPTIONAL,
+       { "audioLayer2", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_audioLayer2 },
-       { "audioLayer3", EXTENSION_ROOT, NOT_OPTIONAL, 
+       { "audioLayer3", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_audioLayer3 },
-       { "audioSampling32k", EXTENSION_ROOT, NOT_OPTIONAL,
+       { "audioSampling32k", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_audioSampling32k },
-       { "audioSampling44k1", EXTENSION_ROOT, NOT_OPTIONAL, 
+       { "audioSampling44k1", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_audioSampling44k1 },
-       { "audioSampling48k", EXTENSION_ROOT, NOT_OPTIONAL,
+       { "audioSampling48k", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_audioSampling48k },
-       { "singleChannel", EXTENSION_ROOT, NOT_OPTIONAL, 
+       { "singleChannel", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_singleChannel },
-       { "twoChannels", EXTENSION_ROOT, NOT_OPTIONAL, 
+       { "twoChannels", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_twoChannels },
-       { "bitRate", EXTENSION_ROOT, NOT_OPTIONAL, 
+       { "bitRate", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_IS11172_BitRate },
        { NULL, 0, 0, NULL }
 };
@@ -7362,13 +7387,13 @@ dissect_h245_IS11172AudioCapability(tvbuff_t *tvb, int offset, packet_info *pinf
 
 
 static per_sequence_t IS11172AudioMode_sequence[] = {
-       { "audioLayer", EXTENSION_ROOT, NOT_OPTIONAL, 
+       { "audioLayer", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_IS11172AudioMode_audioLayer },
-       { "audioSampling", EXTENSION_ROOT, NOT_OPTIONAL, 
+       { "audioSampling", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_IS11172AudioMode_audioSampling },
-       { "multichannelType", EXTENSION_ROOT, NOT_OPTIONAL, 
+       { "multichannelType", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_IS11172AudioMode_multichannelType },
-       { "bitRate", EXTENSION_ROOT, NOT_OPTIONAL, 
+       { "bitRate", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_IS11172_BitRate },
        { NULL, 0, 0, NULL }
 };
@@ -7383,17 +7408,17 @@ dissect_h245_IS11172AudioMode(tvbuff_t *tvb, int offset, packet_info *pinfo, pro
 
 
 static per_sequence_t IS13818AudioMode_sequence[] = {
-       { "audioLayer", EXTENSION_ROOT, NOT_OPTIONAL, 
+       { "audioLayer", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                        dissect_h245_IS13818AudioMode_audioLayer },
-       { "audioSampling", EXTENSION_ROOT, NOT_OPTIONAL, 
+       { "audioSampling", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                        dissect_h245_IS13818AudioMode_audioSampling },
-       { "multiChannelType", EXTENSION_ROOT, NOT_OPTIONAL, 
+       { "multiChannelType", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                        dissect_h245_IS13818AudioMode_multiChannelType },
-       { "lowFrequencyEnhancement", EXTENSION_ROOT, NOT_OPTIONAL, 
+       { "lowFrequencyEnhancement", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                        dissect_h245_lowFrequencyEnhancement },
-       { "multilingual", EXTENSION_ROOT, NOT_OPTIONAL,
+       { "multilingual", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                        dissect_h245_multilingual },
-       { "bitRate", EXTENSION_ROOT, NOT_OPTIONAL, 
+       { "bitRate", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                        dissect_h245_IS13818_BitRate },
        { NULL, 0, 0, NULL }
 };
@@ -7409,47 +7434,47 @@ dissect_h245_IS13818AudioMode(tvbuff_t *tvb, int offset, packet_info *pinfo, pro
 
 
 static per_sequence_t IS13818AudioCapability_sequence[] = {
-       { "audioLayer1", EXTENSION_ROOT, NOT_OPTIONAL,
+       { "audioLayer1", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_audioLayer1 },
-       { "audioLayer2", EXTENSION_ROOT, NOT_OPTIONAL, 
+       { "audioLayer2", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_audioLayer2 },
-       { "audioLayer3", EXTENSION_ROOT, NOT_OPTIONAL, 
+       { "audioLayer3", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_audioLayer3 },
-       { "audioSampling16k", EXTENSION_ROOT, NOT_OPTIONAL, 
+       { "audioSampling16k", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_audioSampling16k },
-       { "audioSampling22k05", EXTENSION_ROOT, NOT_OPTIONAL,
+       { "audioSampling22k05", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_audioSampling22k05 },
-       { "audioSampling24k", EXTENSION_ROOT, NOT_OPTIONAL,
+       { "audioSampling24k", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_audioSampling24k },
-       { "audioSampling32k", EXTENSION_ROOT, NOT_OPTIONAL, 
+       { "audioSampling32k", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_audioSampling32k },
-       { "audioSampling44k1", EXTENSION_ROOT, NOT_OPTIONAL, 
+       { "audioSampling44k1", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_audioSampling44k1 },
-       { "audioSampling48k", EXTENSION_ROOT, NOT_OPTIONAL,
+       { "audioSampling48k", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_audioSampling48k },
-       { "singleChannel", EXTENSION_ROOT, NOT_OPTIONAL, 
+       { "singleChannel", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_singleChannel },
-       { "twoChannels", EXTENSION_ROOT, NOT_OPTIONAL, 
+       { "twoChannels", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_twoChannels },
-       { "threeChannels2-1", EXTENSION_ROOT, NOT_OPTIONAL, 
+       { "threeChannels2-1", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_threeChannels21 },
-       { "threeChannels3-0", EXTENSION_ROOT, NOT_OPTIONAL, 
+       { "threeChannels3-0", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_threeChannels30 },
-       { "fourChannels2-0-2-0", EXTENSION_ROOT, NOT_OPTIONAL,
+       { "fourChannels2-0-2-0", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_fourChannels2020 },
-       { "fourChannels2-2", EXTENSION_ROOT, NOT_OPTIONAL, 
+       { "fourChannels2-2", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_fourChannels22 },
-       { "fourChannels3-1", EXTENSION_ROOT, NOT_OPTIONAL, 
+       { "fourChannels3-1", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_fourChannels31 },
-       { "fiveChannels3-0-2-0", EXTENSION_ROOT, NOT_OPTIONAL,
+       { "fiveChannels3-0-2-0", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_fiveChannels3020 },
-       { "fiveChannels3-2", EXTENSION_ROOT, NOT_OPTIONAL, 
+       { "fiveChannels3-2", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_fiveChannels32 },
-       { "lowFrequencyEnhancement", EXTENSION_ROOT, NOT_OPTIONAL, 
+       { "lowFrequencyEnhancement", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_lowFrequencyEnhancement },
-       { "multilingual", EXTENSION_ROOT, NOT_OPTIONAL, 
+       { "multilingual", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_multilingual },
-       { "bitRate", EXTENSION_ROOT, NOT_OPTIONAL,
+       { "bitRate", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_IS13818_BitRate },
        { NULL, 0, 0, NULL }
 };
@@ -7467,10 +7492,10 @@ dissect_h245_IS13818AudioCapability(tvbuff_t *tvb, int offset, packet_info *pinf
 static int
 dissect_h245_ATM_BitRate(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree)
 {
-       offset=dissect_per_constrained_integer(tvb, offset, pinfo, 
-               tree, hf_h245_ATM_BitRate, 1, 65535, 
+       offset=dissect_per_constrained_integer(tvb, offset, pinfo,
+               tree, hf_h245_ATM_BitRate, 1, 65535,
                NULL, NULL, FALSE);
-       
+
        return offset;
 }
 
@@ -7478,13 +7503,13 @@ dissect_h245_ATM_BitRate(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tr
 
 
 static per_sequence_t NewATMVCIndication_reverseParameters_sequence[] = {
-       { "bitRate", EXTENSION_ROOT, NOT_OPTIONAL, 
+       { "bitRate", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_ATM_BitRate },
-       { "bitRateLockedToPCRClock", EXTENSION_ROOT, NOT_OPTIONAL, 
+       { "bitRateLockedToPCRClock", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_bitRateLockedToPCRClock },
-       { "bitRateLockedToNetworkClock", EXTENSION_ROOT, NOT_OPTIONAL, 
+       { "bitRateLockedToNetworkClock", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_bitRateLockedToNetworkClock },
-       { "multiplex", EXTENSION_ROOT, NOT_OPTIONAL, 
+       { "multiplex", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_NewATMVCIndication_reverseParameters_multiplex },
        { NULL, 0, 0, NULL }
 };
@@ -7499,13 +7524,13 @@ dissect_h245_NewATMVCIndication_reverseParameters(tvbuff_t *tvb, int offset, pac
 
 
 static per_sequence_t NewATMVCCommand_reverseParameters_sequence[] = {
-       { "bitRate", EXTENSION_ROOT, NOT_OPTIONAL,
+       { "bitRate", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_ATM_BitRate },
-       { "bitRateLockedToPCRClock", EXTENSION_ROOT, NOT_OPTIONAL, 
+       { "bitRateLockedToPCRClock", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_bitRateLockedToPCRClock },
-       { "bitRateLockedToNetworkClock", EXTENSION_ROOT, NOT_OPTIONAL,
+       { "bitRateLockedToNetworkClock", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_bitRateLockedToNetworkClock },
-       { "multiplex", EXTENSION_ROOT, NOT_OPTIONAL, 
+       { "multiplex", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_NewATMVCCommand_reverseParameters_multiplex },
        { NULL, 0, 0, NULL }
 };
@@ -7517,13 +7542,12 @@ dissect_h245_NewATMVCCommand_reverseParameters(tvbuff_t *tvb, int offset, packet
        return offset;
 }
 
-
 static int
 dissect_h245_t35CountryCode(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree)
 {
-       offset=dissect_per_constrained_integer(tvb, offset, pinfo, 
+       offset=dissect_per_constrained_integer(tvb, offset, pinfo,
                tree, hf_h245_t35CountryCode, 0, 255,
-               NULL, NULL, FALSE);
+               &t35CountryCode, NULL, FALSE);
 
        return offset;
 }
@@ -7532,9 +7556,9 @@ dissect_h245_t35CountryCode(tvbuff_t *tvb, int offset, packet_info *pinfo, proto
 static int
 dissect_h245_t35Extension(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree)
 {
-       offset=dissect_per_constrained_integer(tvb, offset, pinfo, 
+       offset=dissect_per_constrained_integer(tvb, offset, pinfo,
                tree, hf_h245_t35Extension, 0, 255,
-               NULL, NULL, FALSE);
+               &t35Extension, NULL, FALSE);
 
        return offset;
 }
@@ -7544,52 +7568,55 @@ dissect_h245_t35Extension(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_t
 static int
 dissect_h245_manufacturerCode(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree)
 {
-       offset=dissect_per_constrained_integer(tvb, offset, pinfo, 
+       offset=dissect_per_constrained_integer(tvb, offset, pinfo,
                tree, hf_h245_manufacturerCode, 0, 65535,
-               NULL, NULL, FALSE);
+               &manufacturerCode, NULL, FALSE);
 
        return offset;
 }
 
 
-
+/* dissect_h245_h221NonStandard is used for H.245 */
 
 static per_sequence_t h221NonStandard_sequence[] = {
-       { "t35CountryCode", NO_EXTENSIONS, NOT_OPTIONAL,
+       { "t35CountryCode", ASN1_NO_EXTENSIONS, ASN1_NOT_OPTIONAL,
                dissect_h245_t35CountryCode },
-       { "t35Extension", NO_EXTENSIONS, NOT_OPTIONAL, 
+       { "t35Extension", ASN1_NO_EXTENSIONS, ASN1_NOT_OPTIONAL,
                dissect_h245_t35Extension },
-       { "manufacturerCode", NO_EXTENSIONS, NOT_OPTIONAL,
+       { "manufacturerCode", ASN1_NO_EXTENSIONS, ASN1_NOT_OPTIONAL,
                dissect_h245_manufacturerCode },
        { NULL, 0, 0, NULL }
 };
 int
 dissect_h245_h221NonStandard(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree)
 {
+       t35CountryCode = 0;
+       t35Extension = 0;
+       manufacturerCode = 0;
+
        offset=dissect_per_sequence(tvb, offset, pinfo, tree, hf_h245_h221NonStandard, ett_h245_h221NonStandard, h221NonStandard_sequence);
 
-       return offset;
-}
+       h221NonStandard = ((t35CountryCode * 256) + t35Extension) * 65536 + manufacturerCode;
 
+       proto_tree_add_uint(tree, hf_h245_h221Manufacturer, tvb, (offset-3)>>3,4,h221NonStandard);
 
+       return offset;
+}
 
 static int
 dissect_h245_terminalType(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree)
 {
-       offset=dissect_per_constrained_integer(tvb, offset, pinfo, 
+       offset=dissect_per_constrained_integer(tvb, offset, pinfo,
                tree, hf_h245_terminalType, 0, 255,
                NULL, NULL, FALSE);
 
        return offset;
 }
 
-
-
-
 static int
 dissect_h245_statusDeterminationNumber(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree)
 {
-       offset=dissect_per_constrained_integer(tvb, offset, pinfo, 
+       offset=dissect_per_constrained_integer(tvb, offset, pinfo,
                tree, hf_h245_statusDeterminationNumber, 0, 16777215,
                NULL, NULL, FALSE);
 
@@ -7599,9 +7626,9 @@ dissect_h245_statusDeterminationNumber(tvbuff_t *tvb, int offset, packet_info *p
 
 
 static per_sequence_t MasterSlaveDetermination_sequence[] = {
-       { "terminalType", EXTENSION_ROOT, NOT_OPTIONAL,
+       { "terminalType", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_terminalType },
-       { "statusDeterminationNumber", EXTENSION_ROOT, NOT_OPTIONAL, 
+       { "statusDeterminationNumber", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_statusDeterminationNumber },
        { NULL, 0, 0, NULL }
 };
@@ -7619,7 +7646,7 @@ dissect_h245_MasterSlaveDetermination(tvbuff_t *tvb, int offset, packet_info *pi
 static int
 dissect_h245_CapabilityTableEntryNumber(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree)
 {
-       offset=dissect_per_constrained_integer(tvb, offset, pinfo, 
+       offset=dissect_per_constrained_integer(tvb, offset, pinfo,
                tree, hf_h245_CapabilityTableEntryNumber, 1, 65535,
                NULL, NULL, FALSE);
 
@@ -7634,9 +7661,9 @@ static const value_string TerminalCapabilitySetReject_cause_tableEntryCapacityEx
        {  0, NULL }
 };
 static per_choice_t TerminalCapabilitySetReject_cause_tableEntryCapacityExceeded_choice[] = {
-       {  0, "highestEntryNumberProcessed", NO_EXTENSIONS,
+       {  0, "highestEntryNumberProcessed", ASN1_NO_EXTENSIONS,
                        dissect_h245_CapabilityTableEntryNumber },
-       {  1, "noneProcessed", NO_EXTENSIONS, 
+       {  1, "noneProcessed", ASN1_NO_EXTENSIONS,
                        dissect_h245_NULL },
        {  0, NULL, 0, NULL }
 };
@@ -7660,13 +7687,13 @@ static const value_string TerminalCapabilitySetReject_cause_vals[] = {
        {  0, NULL }
 };
 static per_choice_t TerminalCapabilitySetReject_cause_choice[] = {
-       {  0, "unspecified", EXTENSION_ROOT, 
+       {  0, "unspecified", ASN1_EXTENSION_ROOT,
                        dissect_h245_NULL },
-       {  1, "undefinedTableEntryUsed", EXTENSION_ROOT, 
+       {  1, "undefinedTableEntryUsed", ASN1_EXTENSION_ROOT,
                        dissect_h245_NULL },
-       {  2, "descriptorCapacityExceeded", EXTENSION_ROOT, 
+       {  2, "descriptorCapacityExceeded", ASN1_EXTENSION_ROOT,
                        dissect_h245_NULL },
-       {  3, "tableEntryCapacityExceeded", EXTENSION_ROOT, 
+       {  3, "tableEntryCapacityExceeded", ASN1_EXTENSION_ROOT,
                        dissect_h245_TerminalCapabilitySetReject_cause_tableEntryCapacityExceeded },
        {  0, NULL, 0, NULL }
 };
@@ -7681,9 +7708,9 @@ dissect_h245_TerminalCapabilitySetReject_cause(tvbuff_t *tvb, int offset, packet
 
 
 static per_sequence_t TerminalCapabilitySetReject_sequence[] = {
-       { "sequenceNumber", EXTENSION_ROOT, NOT_OPTIONAL, 
+       { "sequenceNumber", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                        dissect_h245_SequenceNumber },
-       { "cause", EXTENSION_ROOT, NOT_OPTIONAL, 
+       { "cause", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                        dissect_h245_TerminalCapabilitySetReject_cause },
        { NULL, 0, 0, NULL }
 };
@@ -7702,7 +7729,7 @@ dissect_h245_TerminalCapabilitySetReject(tvbuff_t *tvb, int offset, packet_info
 static int
 dissect_h245_CapabilityDescriptorNumber(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree)
 {
-       offset=dissect_per_constrained_integer(tvb, offset, pinfo, 
+       offset=dissect_per_constrained_integer(tvb, offset, pinfo,
                tree, hf_h245_CapabilityDescriptorNumber, 0, 255,
                NULL, NULL, FALSE);
 
@@ -7715,7 +7742,7 @@ dissect_h245_CapabilityDescriptorNumber(tvbuff_t *tvb, int offset, packet_info *
 static int
 dissect_h245_h233IVResponseTime(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree)
 {
-       offset=dissect_per_constrained_integer(tvb, offset, pinfo, 
+       offset=dissect_per_constrained_integer(tvb, offset, pinfo,
                tree, hf_h245_h233IVResponseTime, 0, 255,
                NULL, NULL, FALSE);
 
@@ -7726,7 +7753,7 @@ dissect_h245_h233IVResponseTime(tvbuff_t *tvb, int offset, packet_info *pinfo, p
 
 
 static per_sequence_t Capability_h233EncryptionReceiveCapability_sequence[] = {
-       { "h233IVResponseTime", EXTENSION_ROOT, NOT_OPTIONAL, 
+       { "h233IVResponseTime", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                        dissect_h245_h233IVResponseTime },
        { NULL, 0, 0, NULL }
 };
@@ -7745,7 +7772,7 @@ dissect_h245_Capability_h233EncryptionReceiveCapability(tvbuff_t *tvb, int offse
 static int
 dissect_h245_maxPendingReplacementFor(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree)
 {
-       offset=dissect_per_constrained_integer(tvb, offset, pinfo, 
+       offset=dissect_per_constrained_integer(tvb, offset, pinfo,
                tree, hf_h245_maxPendingReplacementFor, 0, 255,
                NULL, NULL, FALSE);
 
@@ -7758,7 +7785,7 @@ dissect_h245_maxPendingReplacementFor(tvbuff_t *tvb, int offset, packet_info *pi
 static int
 dissect_h245_numberOfVCs(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree)
 {
-       offset=dissect_per_constrained_integer(tvb, offset, pinfo, 
+       offset=dissect_per_constrained_integer(tvb, offset, pinfo,
                tree, hf_h245_numberOfVCs, 1, 256,
                NULL, NULL, FALSE);
 
@@ -7772,7 +7799,7 @@ dissect_h245_numberOfVCs(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tr
 static int
 dissect_h245_forwardMaximumSDUSize(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree)
 {
-       offset=dissect_per_constrained_integer(tvb, offset, pinfo, 
+       offset=dissect_per_constrained_integer(tvb, offset, pinfo,
                tree, hf_h245_forwardMaximumSDUSize, 0, 65535,
                NULL, NULL, FALSE);
 
@@ -7785,7 +7812,7 @@ dissect_h245_forwardMaximumSDUSize(tvbuff_t *tvb, int offset, packet_info *pinfo
 static int
 dissect_h245_backwardMaximumSDUSize(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree)
 {
-       offset=dissect_per_constrained_integer(tvb, offset, pinfo, 
+       offset=dissect_per_constrained_integer(tvb, offset, pinfo,
                tree, hf_h245_backwardMaximumSDUSize, 0, 65535,
                NULL, NULL, FALSE);
 
@@ -7797,9 +7824,9 @@ dissect_h245_backwardMaximumSDUSize(tvbuff_t *tvb, int offset, packet_info *pinf
 
 
 static per_sequence_t VCCapability_aal5_sequence[] = {
-       { "forwardMaximumSDUSize", EXTENSION_ROOT, NOT_OPTIONAL, 
+       { "forwardMaximumSDUSize", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_forwardMaximumSDUSize },
-       { "backwardMaximumSDUSize", EXTENSION_ROOT, NOT_OPTIONAL,
+       { "backwardMaximumSDUSize", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_backwardMaximumSDUSize },
        { NULL, 0, 0, NULL }
 };
@@ -7814,9 +7841,9 @@ dissect_h245_VCCapability_aal5(tvbuff_t *tvb, int offset, packet_info *pinfo, pr
 
 
 static per_sequence_t NewATMVCCommand_aal_aal5_sequence[] = {
-       { "forwardMaximumSDUSize", EXTENSION_ROOT, NOT_OPTIONAL, 
+       { "forwardMaximumSDUSize", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_forwardMaximumSDUSize},
-       { "backwardMaximumSDUSize", EXTENSION_ROOT, NOT_OPTIONAL,
+       { "backwardMaximumSDUSize", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_backwardMaximumSDUSize },
        { NULL, 0, 0, NULL }
 };
@@ -7838,9 +7865,9 @@ static const value_string NewATMVCCommand_aal_vals[] = {
        {  0, NULL }
 };
 static per_choice_t NewATMVCCommand_aal_choice[] = {
-       {  0, "aal1", EXTENSION_ROOT, 
+       {  0, "aal1", ASN1_EXTENSION_ROOT,
                dissect_h245_NewATMVCCommand_aal_aal1 },
-       {  1, "aal5", EXTENSION_ROOT, 
+       {  1, "aal5", ASN1_EXTENSION_ROOT,
                dissect_h245_NewATMVCCommand_aal_aal5 },
        {  0, NULL, 0, NULL }
 };
@@ -7856,9 +7883,9 @@ dissect_h245_NewATMVCCommand_aal(tvbuff_t *tvb, int offset, packet_info *pinfo,
 
 
 static per_sequence_t NewATMVCIndication_aal_aal5_sequence[] = {
-       { "forwardMaximumSDUSize", EXTENSION_ROOT, NOT_OPTIONAL, 
+       { "forwardMaximumSDUSize", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_forwardMaximumSDUSize },
-       { "backwardMaximumSDUSize", EXTENSION_ROOT, NOT_OPTIONAL,
+       { "backwardMaximumSDUSize", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_backwardMaximumSDUSize },
        { NULL, 0, 0, NULL }
 };
@@ -7879,9 +7906,9 @@ static const value_string NewATMVCIndication_aal_vals[] = {
        {  0, NULL }
 };
 static per_choice_t NewATMVCIndication_aal_choice[] = {
-       {  0, "aal1", EXTENSION_ROOT, 
+       {  0, "aal1", ASN1_EXTENSION_ROOT,
                dissect_h245_NewATMVCIndication_aal_aal1 },
-       {  1, "aal5", EXTENSION_ROOT,
+       {  1, "aal5", ASN1_EXTENSION_ROOT,
                dissect_h245_NewATMVCIndication_aal_aal5 },
        {  0, NULL, 0, NULL }
 };
@@ -7899,7 +7926,7 @@ dissect_h245_NewATMVCIndication_aal(tvbuff_t *tvb, int offset, packet_info *pinf
 static int
 dissect_h245_singleBitRate(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree)
 {
-       offset=dissect_per_constrained_integer(tvb, offset, pinfo, 
+       offset=dissect_per_constrained_integer(tvb, offset, pinfo,
                tree, hf_h245_singleBitRate, 1, 65535,
                NULL, NULL, FALSE);
 
@@ -7912,7 +7939,7 @@ dissect_h245_singleBitRate(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_
 static int
 dissect_h245_lowerBitRate(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree)
 {
-       offset=dissect_per_constrained_integer(tvb, offset, pinfo, 
+       offset=dissect_per_constrained_integer(tvb, offset, pinfo,
                tree, hf_h245_lowerBitRate, 1, 65535,
                NULL, NULL, FALSE);
 
@@ -7924,7 +7951,7 @@ dissect_h245_lowerBitRate(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_t
 static int
 dissect_h245_higherBitRate(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree)
 {
-       offset=dissect_per_constrained_integer(tvb, offset, pinfo, 
+       offset=dissect_per_constrained_integer(tvb, offset, pinfo,
                tree, hf_h245_higherBitRate, 1, 65535,
                NULL, NULL, FALSE);
 
@@ -7936,9 +7963,9 @@ dissect_h245_higherBitRate(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_
 
 
 static per_sequence_t VCCapability_availableBitRates_rangeOfBitRates_sequence[] = {
-       { "lowerBitRate", NO_EXTENSIONS, NOT_OPTIONAL, 
+       { "lowerBitRate", ASN1_NO_EXTENSIONS, ASN1_NOT_OPTIONAL,
                        dissect_h245_lowerBitRate },
-       { "higherBitRate", NO_EXTENSIONS, NOT_OPTIONAL, 
+       { "higherBitRate", ASN1_NO_EXTENSIONS, ASN1_NOT_OPTIONAL,
                        dissect_h245_higherBitRate },
        { NULL, 0, 0, NULL }
 };
@@ -7959,9 +7986,9 @@ static const value_string VCCapability_availableBitRates_type_vals[] = {
        {  0, NULL }
 };
 static per_choice_t VCCapability_availableBitRates_type_choice[] = {
-       {  0, "singleBitRate", NO_EXTENSIONS, 
+       {  0, "singleBitRate", ASN1_NO_EXTENSIONS,
                        dissect_h245_singleBitRate },
-       {  1, "rangeOfBitRates", NO_EXTENSIONS,
+       {  1, "rangeOfBitRates", ASN1_NO_EXTENSIONS,
                        dissect_h245_VCCapability_availableBitRates_rangeOfBitRates },
        {  0, NULL, 0, NULL }
 };
@@ -7978,7 +8005,7 @@ dissect_h245_VCCapability_availableBitRates_type(tvbuff_t *tvb, int offset, pack
 static int
 dissect_h245_maximumAl2SDUSize(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree)
 {
-       offset=dissect_per_constrained_integer(tvb, offset, pinfo, 
+       offset=dissect_per_constrained_integer(tvb, offset, pinfo,
                tree, hf_h245_maximumAl2SDUSize, 0, 65535,
                NULL, NULL, FALSE);
 
@@ -7991,7 +8018,7 @@ dissect_h245_maximumAl2SDUSize(tvbuff_t *tvb, int offset, packet_info *pinfo, pr
 static int
 dissect_h245_maximumAl3SDUSize(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree)
 {
-       offset=dissect_per_constrained_integer(tvb, offset, pinfo, 
+       offset=dissect_per_constrained_integer(tvb, offset, pinfo,
                tree, hf_h245_maximumAl3SDUSize, 0, 65535,
                NULL, NULL, FALSE);
 
@@ -8004,7 +8031,7 @@ dissect_h245_maximumAl3SDUSize(tvbuff_t *tvb, int offset, packet_info *pinfo, pr
 static int
 dissect_h245_maximumDelayJitter(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree)
 {
-       offset=dissect_per_constrained_integer(tvb, offset, pinfo, 
+       offset=dissect_per_constrained_integer(tvb, offset, pinfo,
                tree, hf_h245_maximumDelayJitter, 0, 1023,
                NULL, NULL, FALSE);
 
@@ -8016,7 +8043,7 @@ dissect_h245_maximumDelayJitter(tvbuff_t *tvb, int offset, packet_info *pinfo, p
 static int
 dissect_h245_maximumNestingDepth(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree)
 {
-       offset=dissect_per_constrained_integer(tvb, offset, pinfo, 
+       offset=dissect_per_constrained_integer(tvb, offset, pinfo,
                tree, hf_h245_maximumNestingDepth, 1, 15,
                NULL, NULL, FALSE);
 
@@ -8028,7 +8055,7 @@ dissect_h245_maximumNestingDepth(tvbuff_t *tvb, int offset, packet_info *pinfo,
 static int
 dissect_h245_maximumElementListSize(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree)
 {
-       offset=dissect_per_constrained_integer(tvb, offset, pinfo, 
+       offset=dissect_per_constrained_integer(tvb, offset, pinfo,
                tree, hf_h245_maximumElementListSize, 2, 255,
                NULL, NULL, FALSE);
 
@@ -8040,7 +8067,7 @@ dissect_h245_maximumElementListSize(tvbuff_t *tvb, int offset, packet_info *pinf
 static int
 dissect_h245_maximumSubElementListSize(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree)
 {
-       offset=dissect_per_constrained_integer(tvb, offset, pinfo, 
+       offset=dissect_per_constrained_integer(tvb, offset, pinfo,
                tree, hf_h245_maximumSubElementListSize, 2, 255,
                NULL, NULL, FALSE);
 
@@ -8050,11 +8077,11 @@ dissect_h245_maximumSubElementListSize(tvbuff_t *tvb, int offset, packet_info *p
 
 
 static per_sequence_t H223Capability_h223MultiplexTableCapability_enhanced_sequence[] = {
-       { "maximumNestingDepth", EXTENSION_ROOT, NOT_OPTIONAL,
+       { "maximumNestingDepth", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                        dissect_h245_maximumNestingDepth },
-       { "maximumElementListSize", EXTENSION_ROOT, NOT_OPTIONAL,
+       { "maximumElementListSize", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                        dissect_h245_maximumElementListSize },
-       { "maximumSubElementListSize", EXTENSION_ROOT, NOT_OPTIONAL,
+       { "maximumSubElementListSize", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                        dissect_h245_maximumSubElementListSize },
        { NULL, 0, 0, NULL }
 };
@@ -8075,9 +8102,9 @@ static const value_string H223Capability_h223MultiplexTableCapability_vals[] = {
        {  0, NULL }
 };
 static per_choice_t H223Capability_h223MultiplexTableCapability_choice[] = {
-       {  0, "basic", NO_EXTENSIONS, 
+       {  0, "basic", ASN1_NO_EXTENSIONS,
                        dissect_h245_NULL },
-       {  1, "enhanced", NO_EXTENSIONS,
+       {  1, "enhanced", ASN1_NO_EXTENSIONS,
                        dissect_h245_H223Capability_h223MultiplexTableCapability_enhanced },
        {  0, NULL, 0, NULL }
 };
@@ -8095,7 +8122,7 @@ dissect_h245_H223Capability_h223MultiplexTableCapability(tvbuff_t *tvb, int offs
 static int
 dissect_h245_h223bitRate(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree)
 {
-       offset=dissect_per_constrained_integer(tvb, offset, pinfo, 
+       offset=dissect_per_constrained_integer(tvb, offset, pinfo,
                tree, hf_h245_h223bitRate, 1, 19200,
                NULL, NULL, FALSE);
 
@@ -8108,7 +8135,7 @@ dissect_h245_h223bitRate(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tr
 static int
 dissect_h245_maximumSampleSize(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree)
 {
-       offset=dissect_per_constrained_integer(tvb, offset, pinfo, 
+       offset=dissect_per_constrained_integer(tvb, offset, pinfo,
                tree, hf_h245_maximumSampleSize, 1, 255,
                NULL, NULL, FALSE);
 
@@ -8121,7 +8148,7 @@ dissect_h245_maximumSampleSize(tvbuff_t *tvb, int offset, packet_info *pinfo, pr
 static int
 dissect_h245_maximumPayloadLength(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree)
 {
-       offset=dissect_per_constrained_integer(tvb, offset, pinfo, 
+       offset=dissect_per_constrained_integer(tvb, offset, pinfo,
                tree, hf_h245_maximumPayloadLength, 1, 65025,
                NULL, NULL, FALSE);
 
@@ -8132,9 +8159,9 @@ dissect_h245_maximumPayloadLength(tvbuff_t *tvb, int offset, packet_info *pinfo,
 
 
 static per_sequence_t H223Capability_mobileMultilinkFrameCapability_sequence[] = {
-       { "maximumSampleSize", EXTENSION_ROOT, NOT_OPTIONAL, 
+       { "maximumSampleSize", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                        dissect_h245_maximumSampleSize },
-       { "maximumPayloadLength", EXTENSION_ROOT, NOT_OPTIONAL, 
+       { "maximumPayloadLength", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                        dissect_h245_maximumPayloadLength },
        { NULL, 0, 0, NULL }
 };
@@ -8152,7 +8179,7 @@ dissect_h245_H223Capability_mobileMultilinkFrameCapability(tvbuff_t *tvb, int of
 static int
 dissect_h245_maximumAL1MPDUSize(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree)
 {
-       offset=dissect_per_constrained_integer(tvb, offset, pinfo, 
+       offset=dissect_per_constrained_integer(tvb, offset, pinfo,
                tree, hf_h245_maximumAL1MPDUSize, 0, 65535,
                NULL, NULL, FALSE);
 
@@ -8165,7 +8192,7 @@ dissect_h245_maximumAL1MPDUSize(tvbuff_t *tvb, int offset, packet_info *pinfo, p
 static int
 dissect_h245_maximumAL2MSDUSize(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree)
 {
-       offset=dissect_per_constrained_integer(tvb, offset, pinfo, 
+       offset=dissect_per_constrained_integer(tvb, offset, pinfo,
                tree, hf_h245_maximumAL2MSDUSize, 0, 65535,
                NULL, NULL, FALSE);
 
@@ -8178,7 +8205,7 @@ dissect_h245_maximumAL2MSDUSize(tvbuff_t *tvb, int offset, packet_info *pinfo, p
 static int
 dissect_h245_maximumAL3MSDUSize(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree)
 {
-       offset=dissect_per_constrained_integer(tvb, offset, pinfo, 
+       offset=dissect_per_constrained_integer(tvb, offset, pinfo,
                tree, hf_h245_maximumAL3MSDUSize, 0, 65535,
                NULL, NULL, FALSE);
 
@@ -8190,33 +8217,33 @@ dissect_h245_maximumAL3MSDUSize(tvbuff_t *tvb, int offset, packet_info *pinfo, p
 
 
 static per_sequence_t H223AnnexCCapability_sequence[] = {
-       { "videoWithAL1M", EXTENSION_ROOT, NOT_OPTIONAL, 
+       { "videoWithAL1M", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_videoWithAL1M },
-       { "videoWithAL2M", EXTENSION_ROOT, NOT_OPTIONAL, 
+       { "videoWithAL2M", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_videoWithAL2M },
-       { "videoWithAL3M", EXTENSION_ROOT, NOT_OPTIONAL, 
+       { "videoWithAL3M", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_videoWithAL3M },
-       { "audioWithAL1M", EXTENSION_ROOT, NOT_OPTIONAL, 
+       { "audioWithAL1M", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_audioWithAL1M },
-       { "audioWithAL2M", EXTENSION_ROOT, NOT_OPTIONAL, 
+       { "audioWithAL2M", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_audioWithAL2M },
-       { "audioWithAL3M", EXTENSION_ROOT, NOT_OPTIONAL, 
+       { "audioWithAL3M", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_audioWithAL3M },
-       { "dataWithAL1M", EXTENSION_ROOT, NOT_OPTIONAL, 
+       { "dataWithAL1M", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_dataWithAL1M },
-       { "dataWithAL2M", EXTENSION_ROOT, NOT_OPTIONAL, 
+       { "dataWithAL2M", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_dataWithAL2M },
-       { "dataWithAL3M", EXTENSION_ROOT, NOT_OPTIONAL, 
+       { "dataWithAL3M", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_dataWithAL3M },
-       { "alpduInterleaving", EXTENSION_ROOT, NOT_OPTIONAL, 
+       { "alpduInterleaving", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_alpduInterleaving },
-       { "maximumAL1MPDUSize", EXTENSION_ROOT, NOT_OPTIONAL,
+       { "maximumAL1MPDUSize", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_maximumAL1MPDUSize },
-       { "maximumAL2MSDUSize", EXTENSION_ROOT, NOT_OPTIONAL,
+       { "maximumAL2MSDUSize", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_maximumAL2MSDUSize },
-       { "maximumAL3MSDUSize", EXTENSION_ROOT, NOT_OPTIONAL,
+       { "maximumAL3MSDUSize", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_maximumAL3MSDUSize },
-       { "rsCodeCapability", NOT_EXTENSION_ROOT, OPTIONAL, 
+       { "rsCodeCapability", ASN1_NOT_EXTENSION_ROOT, ASN1_OPTIONAL,
                dissect_h245_rsCodeCapability },
        { NULL, 0, 0, NULL }
 };
@@ -8244,45 +8271,45 @@ dissect_h245_transportWithIframes(tvbuff_t *tvb, int offset, packet_info *pinfo,
 
 
 static per_sequence_t H223Capability_sequence[] = {
-       { "transportWithIframes", EXTENSION_ROOT, NOT_OPTIONAL,
+       { "transportWithIframes", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_transportWithIframes },
-       { "videoWithAL1", EXTENSION_ROOT, NOT_OPTIONAL, 
+       { "videoWithAL1", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_videoWithAL1 },
-       { "videoWithAL2", EXTENSION_ROOT, NOT_OPTIONAL, 
+       { "videoWithAL2", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_videoWithAL2 },
-       { "videoWithAL3", EXTENSION_ROOT, NOT_OPTIONAL, 
+       { "videoWithAL3", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_videoWithAL3 },
-       { "audioWithAL1", EXTENSION_ROOT, NOT_OPTIONAL,
+       { "audioWithAL1", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_audioWithAL1 },
-       { "audioWithAL2", EXTENSION_ROOT, NOT_OPTIONAL, 
+       { "audioWithAL2", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_audioWithAL2 },
-       { "audioWithAL3", EXTENSION_ROOT, NOT_OPTIONAL, 
+       { "audioWithAL3", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_audioWithAL3 },
-       { "dataWithAL1", EXTENSION_ROOT, NOT_OPTIONAL, 
+       { "dataWithAL1", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_dataWithAL1 },
-       { "dataWithAL2", EXTENSION_ROOT, NOT_OPTIONAL, 
+       { "dataWithAL2", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_dataWithAL2 },
-       { "dataWithAL3", EXTENSION_ROOT, NOT_OPTIONAL, 
+       { "dataWithAL3", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_dataWithAL3 },
-       { "maximumAL2SDUSize", EXTENSION_ROOT, NOT_OPTIONAL, 
+       { "maximumAL2SDUSize", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_maximumAl2SDUSize },
-       { "maximumAL3SDUSize", EXTENSION_ROOT, NOT_OPTIONAL, 
+       { "maximumAL3SDUSize", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_maximumAl3SDUSize },
-       { "maximumDelayJitter", EXTENSION_ROOT, NOT_OPTIONAL, 
+       { "maximumDelayJitter", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_maximumDelayJitter },
-       { "h223MultiplexTableCapability", EXTENSION_ROOT, NOT_OPTIONAL, 
+       { "h223MultiplexTableCapability", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_H223Capability_h223MultiplexTableCapability },
-       { "maxMUXPDUSizeCapability", NOT_EXTENSION_ROOT, NOT_OPTIONAL, 
+       { "maxMUXPDUSizeCapability", ASN1_NOT_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_maxMUXPDUSizeCapability },
-       { "nsrpSupport", NOT_EXTENSION_ROOT, NOT_OPTIONAL, 
+       { "nsrpSupport", ASN1_NOT_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_nsrpSupport },
-       { "mobileOperationTransmitCapability", NOT_EXTENSION_ROOT, OPTIONAL,
+       { "mobileOperationTransmitCapability", ASN1_NOT_EXTENSION_ROOT, ASN1_OPTIONAL,
                dissect_h245_H223Capability_mobileOperationTransmitCapability },
-       { "h223AnnexCCapability", NOT_EXTENSION_ROOT, OPTIONAL,
+       { "h223AnnexCCapability", ASN1_NOT_EXTENSION_ROOT, ASN1_OPTIONAL,
                dissect_h245_H223AnnexCCapability },
-       { "bitRate", NOT_EXTENSION_ROOT, OPTIONAL,
+       { "bitRate", ASN1_NOT_EXTENSION_ROOT, ASN1_OPTIONAL,
                dissect_h245_h223bitRate },
-       { "mobileMultilinkFrameCapability", NOT_EXTENSION_ROOT, OPTIONAL,
+       { "mobileMultilinkFrameCapability", ASN1_NOT_EXTENSION_ROOT, ASN1_OPTIONAL,
                dissect_h245_H223Capability_mobileMultilinkFrameCapability },
        { NULL, 0, 0, NULL }
 };
@@ -8300,7 +8327,7 @@ dissect_h245_H223Capability(tvbuff_t *tvb, int offset, packet_info *pinfo, proto
 static int
 dissect_h245_numOfDLCS(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree)
 {
-       offset=dissect_per_constrained_integer(tvb, offset, pinfo, 
+       offset=dissect_per_constrained_integer(tvb, offset, pinfo,
                tree, hf_h245_numOfDLCS, 2, 8191,
                NULL, NULL, FALSE);
 
@@ -8313,7 +8340,7 @@ dissect_h245_numOfDLCS(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree
 static int
 dissect_h245_n401Capability(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree)
 {
-       offset=dissect_per_constrained_integer(tvb, offset, pinfo, 
+       offset=dissect_per_constrained_integer(tvb, offset, pinfo,
                tree, hf_h245_n401Capability, 1, 4095,
                NULL, NULL, FALSE);
 
@@ -8326,7 +8353,7 @@ dissect_h245_n401Capability(tvbuff_t *tvb, int offset, packet_info *pinfo, proto
 static int
 dissect_h245_maxWindowSizeCapability(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree)
 {
-       offset=dissect_per_constrained_integer(tvb, offset, pinfo, 
+       offset=dissect_per_constrained_integer(tvb, offset, pinfo,
                tree, hf_h245_maxWindowSizeCapability, 1, 127,
                NULL, NULL, FALSE);
 
@@ -8337,35 +8364,35 @@ dissect_h245_maxWindowSizeCapability(tvbuff_t *tvb, int offset, packet_info *pin
 
 
 static per_sequence_t V76Capability_sequence[] = {
-       { "suspendResumeCapabilitywAddress", EXTENSION_ROOT, NOT_OPTIONAL, 
+       { "suspendResumeCapabilitywAddress", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_suspendResumeCapabilitywAddress },
-       { "suspendResumeCapabilitywoAddress", EXTENSION_ROOT, NOT_OPTIONAL, 
+       { "suspendResumeCapabilitywoAddress", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_suspendResumeCapabilitywoAddress },
-       { "rejCapability", EXTENSION_ROOT, NOT_OPTIONAL, 
+       { "rejCapability", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_rejCapability },
-       { "sREJCapability", EXTENSION_ROOT, NOT_OPTIONAL, 
+       { "sREJCapability", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_sREJCapability },
-       { "mREJCapability", EXTENSION_ROOT, NOT_OPTIONAL,
+       { "mREJCapability", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_mREJCapability },
-       { "crc8bitCapability", EXTENSION_ROOT, NOT_OPTIONAL, 
+       { "crc8bitCapability", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_crc8bitCapability },
-       { "crc16bitCapability", EXTENSION_ROOT, NOT_OPTIONAL, 
+       { "crc16bitCapability", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_crc16bitCapability },
-       { "crc32bitCapability", EXTENSION_ROOT, NOT_OPTIONAL, 
+       { "crc32bitCapability", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_crc32bitCapability },
-       { "uihCapability", EXTENSION_ROOT, NOT_OPTIONAL, 
+       { "uihCapability", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_uihCapability },
-       { "numOfDLCS", EXTENSION_ROOT, NOT_OPTIONAL,
+       { "numOfDLCS", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_numOfDLCS },
-       { "twoOctetAddressFieldCapability", EXTENSION_ROOT, NOT_OPTIONAL, 
+       { "twoOctetAddressFieldCapability", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_twoOctetAddressFieldCapability },
-       { "loopBackTestCapability", EXTENSION_ROOT, NOT_OPTIONAL, 
+       { "loopBackTestCapability", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_loopBackTestCapability },
-       { "n401Capability", EXTENSION_ROOT, NOT_OPTIONAL,
+       { "n401Capability", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_n401Capability },
-       { "maxWindowSizeCapability", EXTENSION_ROOT, NOT_OPTIONAL,
+       { "maxWindowSizeCapability", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_maxWindowSizeCapability },
-       { "v75Capability", EXTENSION_ROOT, NOT_OPTIONAL, 
+       { "v75Capability", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_V75Capability },
        { NULL, 0, 0, NULL }
 };
@@ -8383,7 +8410,7 @@ dissect_h245_V76Capability(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_
 static int
 dissect_h245_maximumAudioDelayJitter(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree)
 {
-       offset=dissect_per_constrained_integer(tvb, offset, pinfo, 
+       offset=dissect_per_constrained_integer(tvb, offset, pinfo,
                tree, hf_h245_maximumAudioDelayJitter, 0, 1023,
                NULL, NULL, FALSE);
 
@@ -8396,7 +8423,7 @@ dissect_h245_maximumAudioDelayJitter(tvbuff_t *tvb, int offset, packet_info *pin
 static int
 dissect_h245_tokenRate(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree)
 {
-       offset=dissect_per_constrained_integer(tvb, offset, pinfo, 
+       offset=dissect_per_constrained_integer(tvb, offset, pinfo,
                tree, hf_h245_tokenRate, 1, 4294967295UL,
                NULL, NULL, FALSE);
 
@@ -8409,7 +8436,7 @@ dissect_h245_tokenRate(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree
 static int
 dissect_h245_bucketSize(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree)
 {
-       offset=dissect_per_constrained_integer(tvb, offset, pinfo, 
+       offset=dissect_per_constrained_integer(tvb, offset, pinfo,
                tree, hf_h245_bucketSize, 1, 4294967295UL,
                NULL, NULL, FALSE);
 
@@ -8422,7 +8449,7 @@ dissect_h245_bucketSize(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tre
 static int
 dissect_h245_peakRate(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree)
 {
-       offset=dissect_per_constrained_integer(tvb, offset, pinfo, 
+       offset=dissect_per_constrained_integer(tvb, offset, pinfo,
                tree, hf_h245_peakRate, 1, 4294967295UL,
                NULL, NULL, FALSE);
 
@@ -8434,7 +8461,7 @@ dissect_h245_peakRate(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree
 static int
 dissect_h245_minPoliced(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree)
 {
-       offset=dissect_per_constrained_integer(tvb, offset, pinfo, 
+       offset=dissect_per_constrained_integer(tvb, offset, pinfo,
                tree, hf_h245_minPoliced, 1, 4294967295UL,
                NULL, NULL, FALSE);
 
@@ -8447,7 +8474,7 @@ dissect_h245_minPoliced(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tre
 static int
 dissect_h245_maxPktSize(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree)
 {
-       offset=dissect_per_constrained_integer(tvb, offset, pinfo, 
+       offset=dissect_per_constrained_integer(tvb, offset, pinfo,
                tree, hf_h245_maxPktSize, 1, 4294967295UL,
                NULL, NULL, FALSE);
 
@@ -8457,17 +8484,17 @@ dissect_h245_maxPktSize(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tre
 
 
 static per_sequence_t RSVPParameters_sequence[] = {
-       { "qosMode", EXTENSION_ROOT, OPTIONAL, 
+       { "qosMode", ASN1_EXTENSION_ROOT, ASN1_OPTIONAL,
                        dissect_h245_QOSMode },
-       { "tokenRate", EXTENSION_ROOT, OPTIONAL, 
+       { "tokenRate", ASN1_EXTENSION_ROOT, ASN1_OPTIONAL,
                        dissect_h245_tokenRate },
-       { "bucketSize", EXTENSION_ROOT, OPTIONAL, 
+       { "bucketSize", ASN1_EXTENSION_ROOT, ASN1_OPTIONAL,
                        dissect_h245_bucketSize },
-       { "peakRate", EXTENSION_ROOT, OPTIONAL,
+       { "peakRate", ASN1_EXTENSION_ROOT, ASN1_OPTIONAL,
                        dissect_h245_peakRate },
-       { "minPoliced", EXTENSION_ROOT, OPTIONAL,
+       { "minPoliced", ASN1_EXTENSION_ROOT, ASN1_OPTIONAL,
                        dissect_h245_minPoliced },
-       { "maxPktSize", EXTENSION_ROOT, OPTIONAL,
+       { "maxPktSize", ASN1_EXTENSION_ROOT, ASN1_OPTIONAL,
                        dissect_h245_maxPktSize },
        { NULL, 0, 0, NULL }
 };
@@ -8485,7 +8512,7 @@ dissect_h245_RSVPParameters(tvbuff_t *tvb, int offset, packet_info *pinfo, proto
 static int
 dissect_h245_maxNTUSize(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree)
 {
-       offset=dissect_per_constrained_integer(tvb, offset, pinfo, 
+       offset=dissect_per_constrained_integer(tvb, offset, pinfo,
                tree, hf_h245_maxNTUSize, 0, 65535,
                NULL, NULL, FALSE);
 
@@ -8495,17 +8522,17 @@ dissect_h245_maxNTUSize(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tre
 
 
 static per_sequence_t ATMParameters_sequence[] = {
-       { "maxNTUSize", EXTENSION_ROOT, NOT_OPTIONAL,
+       { "maxNTUSize", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_maxNTUSize },
-       { "atmUBR", EXTENSION_ROOT, NOT_OPTIONAL, 
+       { "atmUBR", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_atmUBR },
-       { "atmrtVBR", EXTENSION_ROOT, NOT_OPTIONAL, 
+       { "atmrtVBR", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_atmrtVBR },
-       { "atmnrtVBR", EXTENSION_ROOT, NOT_OPTIONAL, 
+       { "atmnrtVBR", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_atmnrtVBR },
-       { "atmABR", EXTENSION_ROOT, NOT_OPTIONAL, 
+       { "atmABR", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_atmABR },
-       { "atmCBR", EXTENSION_ROOT, NOT_OPTIONAL, 
+       { "atmCBR", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_atmCBR },
        { NULL, 0, 0, NULL }
 };
@@ -8523,7 +8550,7 @@ dissect_h245_ATMParameters(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_
 static int
 dissect_h245_numberOfThreads(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree)
 {
-       offset=dissect_per_constrained_integer(tvb, offset, pinfo, 
+       offset=dissect_per_constrained_integer(tvb, offset, pinfo,
                tree, hf_h245_numberOfThreads, 1, 16,
                NULL, NULL, FALSE);
 
@@ -8535,7 +8562,7 @@ dissect_h245_numberOfThreads(tvbuff_t *tvb, int offset, packet_info *pinfo, prot
 static int
 dissect_h245_framesBetweenSyncPoints(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree)
 {
-       offset=dissect_per_constrained_integer(tvb, offset, pinfo, 
+       offset=dissect_per_constrained_integer(tvb, offset, pinfo,
                tree, hf_h245_framesBetweenSyncPoints, 1, 256,
                NULL, NULL, FALSE);
 
@@ -8547,7 +8574,7 @@ dissect_h245_framesBetweenSyncPoints(tvbuff_t *tvb, int offset, packet_info *pin
 static int
 dissect_h245_threadNumber(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree)
 {
-       offset=dissect_per_constrained_integer(tvb, offset, pinfo, 
+       offset=dissect_per_constrained_integer(tvb, offset, pinfo,
                tree, hf_h245_threadNumber, 0, 15,
                NULL, NULL, FALSE);
 
@@ -8560,7 +8587,7 @@ dissect_h245_threadNumber(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_t
 static int
 dissect_h245_qcifMPI_1_4(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree)
 {
-       offset=dissect_per_constrained_integer(tvb, offset, pinfo, 
+       offset=dissect_per_constrained_integer(tvb, offset, pinfo,
                tree, hf_h245_qcifMPI_1_4, 1, 4,
                NULL, NULL, FALSE);
 
@@ -8573,7 +8600,7 @@ dissect_h245_qcifMPI_1_4(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tr
 static int
 dissect_h245_qcifMPI_1_32(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree)
 {
-       offset=dissect_per_constrained_integer(tvb, offset, pinfo, 
+       offset=dissect_per_constrained_integer(tvb, offset, pinfo,
                tree, hf_h245_qcifMPI_1_32, 1, 32,
                NULL, NULL, FALSE);
 
@@ -8588,7 +8615,7 @@ dissect_h245_qcifMPI_1_32(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_t
 static int
 dissect_h245_qcifMPI_1_2048(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree)
 {
-       offset=dissect_per_constrained_integer(tvb, offset, pinfo, 
+       offset=dissect_per_constrained_integer(tvb, offset, pinfo,
                tree, hf_h245_qcifMPI_1_2048, 1, 2048,
                NULL, NULL, FALSE);
 
@@ -8601,7 +8628,7 @@ dissect_h245_qcifMPI_1_2048(tvbuff_t *tvb, int offset, packet_info *pinfo, proto
 static int
 dissect_h245_cifMPI_1_4(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree)
 {
-       offset=dissect_per_constrained_integer(tvb, offset, pinfo, 
+       offset=dissect_per_constrained_integer(tvb, offset, pinfo,
                tree, hf_h245_cifMPI_1_4, 1, 4,
                NULL, NULL, FALSE);
 
@@ -8613,7 +8640,7 @@ dissect_h245_cifMPI_1_4(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tre
 static int
 dissect_h245_cifMPI_1_32(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree)
 {
-       offset=dissect_per_constrained_integer(tvb, offset, pinfo, 
+       offset=dissect_per_constrained_integer(tvb, offset, pinfo,
                tree, hf_h245_cifMPI_1_32, 1, 32,
                NULL, NULL, FALSE);
 
@@ -8625,7 +8652,7 @@ dissect_h245_cifMPI_1_32(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tr
 static int
 dissect_h245_cifMPI_1_2048(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree)
 {
-       offset=dissect_per_constrained_integer(tvb, offset, pinfo, 
+       offset=dissect_per_constrained_integer(tvb, offset, pinfo,
                tree, hf_h245_cifMPI_1_2048, 1, 2048,
                NULL, NULL, FALSE);
 
@@ -8637,17 +8664,17 @@ dissect_h245_cifMPI_1_2048(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_
 
 
 static per_sequence_t H261VideoCapability_sequence[] = {
-       { "qcifMPI", EXTENSION_ROOT, OPTIONAL,
+       { "qcifMPI", ASN1_EXTENSION_ROOT, ASN1_OPTIONAL,
                dissect_h245_qcifMPI_1_4 },
-       { "cifMPI", EXTENSION_ROOT, OPTIONAL,
+       { "cifMPI", ASN1_EXTENSION_ROOT, ASN1_OPTIONAL,
                dissect_h245_cifMPI_1_4 },
-       { "temporalSpatialTradeOffCapability", EXTENSION_ROOT, NOT_OPTIONAL,
+       { "temporalSpatialTradeOffCapability", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_temporalSpatialTradeOffCapability },
-       { "maxBitRate", EXTENSION_ROOT, NOT_OPTIONAL,
+       { "maxBitRate", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_h223bitRate },
-       { "stillImageTransmission", EXTENSION_ROOT, NOT_OPTIONAL, 
+       { "stillImageTransmission", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_stillImageTransmission },
-       { "videoBadMBsCap", NOT_EXTENSION_ROOT, NOT_OPTIONAL,
+       { "videoBadMBsCap", ASN1_NOT_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_videoBadMBsCap },
        { NULL, 0, 0, NULL }
 };
@@ -8665,7 +8692,7 @@ dissect_h245_H261VideoCapability(tvbuff_t *tvb, int offset, packet_info *pinfo,
 static int
 dissect_h245_videoBitRate(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree)
 {
-       offset=dissect_per_constrained_integer(tvb, offset, pinfo, 
+       offset=dissect_per_constrained_integer(tvb, offset, pinfo,
                tree, hf_h245_videoBitRate, 0, 1073741823,
                NULL, NULL, FALSE);
 
@@ -8678,7 +8705,7 @@ dissect_h245_videoBitRate(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_t
 static int
 dissect_h245_vbvBufferSize(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree)
 {
-       offset=dissect_per_constrained_integer(tvb, offset, pinfo, 
+       offset=dissect_per_constrained_integer(tvb, offset, pinfo,
                tree, hf_h245_vbvBufferSize, 0, 262143,
                NULL, NULL, FALSE);
 
@@ -8692,7 +8719,7 @@ dissect_h245_vbvBufferSize(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_
 static int
 dissect_h245_samplesPerLine(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree)
 {
-       offset=dissect_per_constrained_integer(tvb, offset, pinfo, 
+       offset=dissect_per_constrained_integer(tvb, offset, pinfo,
                tree, hf_h245_samplesPerLine, 0, 16383,
                NULL, NULL, FALSE);
 
@@ -8706,7 +8733,7 @@ dissect_h245_samplesPerLine(tvbuff_t *tvb, int offset, packet_info *pinfo, proto
 static int
 dissect_h245_linesPerFrame(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree)
 {
-       offset=dissect_per_constrained_integer(tvb, offset, pinfo, 
+       offset=dissect_per_constrained_integer(tvb, offset, pinfo,
                tree, hf_h245_linesPerFrame, 0, 16383,
                NULL, NULL, FALSE);
 
@@ -8720,7 +8747,7 @@ dissect_h245_linesPerFrame(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_
 static int
 dissect_h245_framesPerSecond(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree)
 {
-       offset=dissect_per_constrained_integer(tvb, offset, pinfo, 
+       offset=dissect_per_constrained_integer(tvb, offset, pinfo,
                tree, hf_h245_framesPerSecond, 0, 15,
                NULL, NULL, FALSE);
 
@@ -8733,7 +8760,7 @@ dissect_h245_framesPerSecond(tvbuff_t *tvb, int offset, packet_info *pinfo, prot
 static int
 dissect_h245_luminanceSampleRate(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree)
 {
-       offset=dissect_per_constrained_integer(tvb, offset, pinfo, 
+       offset=dissect_per_constrained_integer(tvb, offset, pinfo,
                tree, hf_h245_luminanceSampleRate, 0, 4294967295UL,
                NULL, NULL, FALSE);
 
@@ -8744,41 +8771,41 @@ dissect_h245_luminanceSampleRate(tvbuff_t *tvb, int offset, packet_info *pinfo,
 
 
 static per_sequence_t H262VideoCapability_sequence[] = {
-       { "profileAndLevel-SPatML", EXTENSION_ROOT, NOT_OPTIONAL,
+       { "profileAndLevel-SPatML", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_profileAndLevelSPatML },
-       { "profileAndLevel-MPatLL", EXTENSION_ROOT, NOT_OPTIONAL, 
+       { "profileAndLevel-MPatLL", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_profileAndLevelMPatLL },
-       { "profileAndLevel-MPatML", EXTENSION_ROOT, NOT_OPTIONAL,
+       { "profileAndLevel-MPatML", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_profileAndLevelMPatML },
-       { "profileAndLevel-MPatH-14", EXTENSION_ROOT, NOT_OPTIONAL, 
+       { "profileAndLevel-MPatH-14", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_profileAndLevelMPatH14 },
-       { "profileAndLevel-MPatHL", EXTENSION_ROOT, NOT_OPTIONAL, 
+       { "profileAndLevel-MPatHL", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_profileAndLevelMPatHL },
-       { "profileAndLevel-SNRatLL", EXTENSION_ROOT, NOT_OPTIONAL, 
+       { "profileAndLevel-SNRatLL", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_profileAndLevelSNRatLL },
-       { "profileAndLevel-SNRatML", EXTENSION_ROOT, NOT_OPTIONAL, 
+       { "profileAndLevel-SNRatML", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_profileAndLevelSNRatML },
-       { "profileAndLevel-SpatialatH-14", EXTENSION_ROOT, NOT_OPTIONAL, 
+       { "profileAndLevel-SpatialatH-14", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_profileAndLevelSpatialatH14 },
-       { "profileAndLevel-HPatML", EXTENSION_ROOT, NOT_OPTIONAL,
+       { "profileAndLevel-HPatML", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_profileAndLevelHPatML },
-       { "profileAndLevel-HPatH-14", EXTENSION_ROOT, NOT_OPTIONAL, 
+       { "profileAndLevel-HPatH-14", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_profileAndLevelHPatH14 },
-       { "profileAndLevel-HPatHL", EXTENSION_ROOT, NOT_OPTIONAL, 
+       { "profileAndLevel-HPatHL", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_profileAndLevelHPatHL },
-       { "videoBitRate", EXTENSION_ROOT, OPTIONAL,
+       { "videoBitRate", ASN1_EXTENSION_ROOT, ASN1_OPTIONAL,
                dissect_h245_videoBitRate },
-       { "vbvBufferSize", EXTENSION_ROOT, OPTIONAL, 
+       { "vbvBufferSize", ASN1_EXTENSION_ROOT, ASN1_OPTIONAL,
                dissect_h245_vbvBufferSize },
-       { "samplesPerLine", EXTENSION_ROOT, OPTIONAL,
+       { "samplesPerLine", ASN1_EXTENSION_ROOT, ASN1_OPTIONAL,
                dissect_h245_samplesPerLine },
-       { "linesPerFrame", EXTENSION_ROOT, OPTIONAL,
+       { "linesPerFrame", ASN1_EXTENSION_ROOT, ASN1_OPTIONAL,
                dissect_h245_linesPerFrame },
-       { "framesPerSecond", EXTENSION_ROOT, OPTIONAL,
+       { "framesPerSecond", ASN1_EXTENSION_ROOT, ASN1_OPTIONAL,
                dissect_h245_framesPerSecond },
-       { "luminanceSampleRate", EXTENSION_ROOT, OPTIONAL,
+       { "luminanceSampleRate", ASN1_EXTENSION_ROOT, ASN1_OPTIONAL,
                dissect_h245_luminanceSampleRate },
-       { "videoBadMBsCap", NOT_EXTENSION_ROOT, NOT_OPTIONAL, 
+       { "videoBadMBsCap", ASN1_NOT_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_videoBadMBsCap },
        { NULL, 0, 0, NULL }
 };
@@ -8795,19 +8822,19 @@ dissect_h245_H262VideoCapability(tvbuff_t *tvb, int offset, packet_info *pinfo,
 
 
 static per_sequence_t H262VideoMode_sequence[] = {
-       { "profileAndLevel", EXTENSION_ROOT, NOT_OPTIONAL, 
+       { "profileAndLevel", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_H262VideoMode_profileAndLevel },
-       { "videoBitRate", EXTENSION_ROOT, OPTIONAL,
+       { "videoBitRate", ASN1_EXTENSION_ROOT, ASN1_OPTIONAL,
                dissect_h245_videoBitRate },
-       { "vbvBufferSize", EXTENSION_ROOT, OPTIONAL, 
+       { "vbvBufferSize", ASN1_EXTENSION_ROOT, ASN1_OPTIONAL,
                dissect_h245_vbvBufferSize },
-       { "samplesPerLine", EXTENSION_ROOT, OPTIONAL,
+       { "samplesPerLine", ASN1_EXTENSION_ROOT, ASN1_OPTIONAL,
                dissect_h245_samplesPerLine },
-       { "linesPerFrame", EXTENSION_ROOT, OPTIONAL,
+       { "linesPerFrame", ASN1_EXTENSION_ROOT, ASN1_OPTIONAL,
                dissect_h245_linesPerFrame },
-       { "framesPerSecond", EXTENSION_ROOT, OPTIONAL,
+       { "framesPerSecond", ASN1_EXTENSION_ROOT, ASN1_OPTIONAL,
                dissect_h245_framesPerSecond },
-       { "luminanceSampleRate", EXTENSION_ROOT, OPTIONAL,
+       { "luminanceSampleRate", ASN1_EXTENSION_ROOT, ASN1_OPTIONAL,
                dissect_h245_luminanceSampleRate },
        { NULL, 0, 0, NULL }
 };
@@ -8825,7 +8852,7 @@ dissect_h245_H262VideoMode(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_
 static int
 dissect_h245_sqcifMPI_1_32(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree)
 {
-       offset=dissect_per_constrained_integer(tvb, offset, pinfo, 
+       offset=dissect_per_constrained_integer(tvb, offset, pinfo,
                tree, hf_h245_sqcifMPI_1_32, 1, 32,
                NULL, NULL, FALSE);
 
@@ -8837,7 +8864,7 @@ dissect_h245_sqcifMPI_1_32(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_
 static int
 dissect_h245_sqcifMPI_1_2048(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree)
 {
-       offset=dissect_per_constrained_integer(tvb, offset, pinfo, 
+       offset=dissect_per_constrained_integer(tvb, offset, pinfo,
                tree, hf_h245_sqcifMPI_1_2048, 1, 2048,
                NULL, NULL, FALSE);
 
@@ -8850,7 +8877,7 @@ dissect_h245_sqcifMPI_1_2048(tvbuff_t *tvb, int offset, packet_info *pinfo, prot
 static int
 dissect_h245_cif4MPI_1_32(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree)
 {
-       offset=dissect_per_constrained_integer(tvb, offset, pinfo, 
+       offset=dissect_per_constrained_integer(tvb, offset, pinfo,
                tree, hf_h245_cif4MPI_1_32, 1, 32,
                NULL, NULL, FALSE);
 
@@ -8863,7 +8890,7 @@ dissect_h245_cif4MPI_1_32(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_t
 static int
 dissect_h245_cif4MPI_1_2048(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree)
 {
-       offset=dissect_per_constrained_integer(tvb, offset, pinfo, 
+       offset=dissect_per_constrained_integer(tvb, offset, pinfo,
                tree, hf_h245_cif4MPI_1_2048, 1, 2048,
                NULL, NULL, FALSE);
 
@@ -8876,7 +8903,7 @@ dissect_h245_cif4MPI_1_2048(tvbuff_t *tvb, int offset, packet_info *pinfo, proto
 static int
 dissect_h245_cif16MPI_1_32(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree)
 {
-       offset=dissect_per_constrained_integer(tvb, offset, pinfo, 
+       offset=dissect_per_constrained_integer(tvb, offset, pinfo,
                tree, hf_h245_cif16MPI_1_32, 1, 32,
                NULL, NULL, FALSE);
 
@@ -8889,7 +8916,7 @@ dissect_h245_cif16MPI_1_32(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_
 static int
 dissect_h245_cif16MPI_1_2048(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree)
 {
-       offset=dissect_per_constrained_integer(tvb, offset, pinfo, 
+       offset=dissect_per_constrained_integer(tvb, offset, pinfo,
                tree, hf_h245_cif16MPI_1_2048, 1, 2048,
                NULL, NULL, FALSE);
 
@@ -8901,7 +8928,7 @@ dissect_h245_cif16MPI_1_2048(tvbuff_t *tvb, int offset, packet_info *pinfo, prot
 static int
 dissect_h245_maxBitRate_192400(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree)
 {
-       offset=dissect_per_constrained_integer(tvb, offset, pinfo, 
+       offset=dissect_per_constrained_integer(tvb, offset, pinfo,
                tree, hf_h245_maxBitRate_192400, 1, 192400,
                NULL, NULL, FALSE);
 
@@ -8915,7 +8942,7 @@ dissect_h245_maxBitRate_192400(tvbuff_t *tvb, int offset, packet_info *pinfo, pr
 static int
 dissect_h245_hrd_B(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree)
 {
-       offset=dissect_per_constrained_integer(tvb, offset, pinfo, 
+       offset=dissect_per_constrained_integer(tvb, offset, pinfo,
                tree, hf_h245_hrd_B, 0, 524287,
                NULL, NULL, FALSE);
 
@@ -8928,7 +8955,7 @@ dissect_h245_hrd_B(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tr
 static int
 dissect_h245_bppMaxKb(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree)
 {
-       offset=dissect_per_constrained_integer(tvb, offset, pinfo, 
+       offset=dissect_per_constrained_integer(tvb, offset, pinfo,
                tree, hf_h245_bppMaxKb, 0, 65535,
                NULL, NULL, FALSE);
 
@@ -8941,7 +8968,7 @@ dissect_h245_bppMaxKb(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree
 static int
 dissect_h245_slowSqcifMPI(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree)
 {
-       offset=dissect_per_constrained_integer(tvb, offset, pinfo, 
+       offset=dissect_per_constrained_integer(tvb, offset, pinfo,
                tree, hf_h245_slowSqcifMPI, 1, 3600,
                NULL, NULL, FALSE);
 
@@ -8954,7 +8981,7 @@ dissect_h245_slowSqcifMPI(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_t
 static int
 dissect_h245_slowQcifMPI(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree)
 {
-       offset=dissect_per_constrained_integer(tvb, offset, pinfo, 
+       offset=dissect_per_constrained_integer(tvb, offset, pinfo,
                tree, hf_h245_slowQcifMPI, 1, 3600,
                NULL, NULL, FALSE);
 
@@ -8966,7 +8993,7 @@ dissect_h245_slowQcifMPI(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tr
 static int
 dissect_h245_slowCifMPI(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree)
 {
-       offset=dissect_per_constrained_integer(tvb, offset, pinfo, 
+       offset=dissect_per_constrained_integer(tvb, offset, pinfo,
                tree, hf_h245_slowCifMPI, 1, 3600,
                NULL, NULL, FALSE);
 
@@ -8979,7 +9006,7 @@ dissect_h245_slowCifMPI(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tre
 static int
 dissect_h245_slowCif4MPI(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree)
 {
-       offset=dissect_per_constrained_integer(tvb, offset, pinfo, 
+       offset=dissect_per_constrained_integer(tvb, offset, pinfo,
                tree, hf_h245_slowCif4MPI, 1, 3600,
                NULL, NULL, FALSE);
 
@@ -8992,7 +9019,7 @@ dissect_h245_slowCif4MPI(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tr
 static int
 dissect_h245_slowCif16MPI(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree)
 {
-       offset=dissect_per_constrained_integer(tvb, offset, pinfo, 
+       offset=dissect_per_constrained_integer(tvb, offset, pinfo,
                tree, hf_h245_slowCif16MPI, 1, 3600,
                NULL, NULL, FALSE);
 
@@ -9006,7 +9033,7 @@ dissect_h245_slowCif16MPI(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_t
 static int
 dissect_h245_numberOfBPictures(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree)
 {
-       offset=dissect_per_constrained_integer(tvb, offset, pinfo, 
+       offset=dissect_per_constrained_integer(tvb, offset, pinfo,
                tree, hf_h245_numberOfBPictures, 1, 64,
                NULL, NULL, FALSE);
 
@@ -9019,7 +9046,7 @@ dissect_h245_numberOfBPictures(tvbuff_t *tvb, int offset, packet_info *pinfo, pr
 static int
 dissect_h245_presentationOrder(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree)
 {
-       offset=dissect_per_constrained_integer(tvb, offset, pinfo, 
+       offset=dissect_per_constrained_integer(tvb, offset, pinfo,
                tree, hf_h245_presentationOrder, 1, 256,
                NULL, NULL, FALSE);
 
@@ -9032,7 +9059,7 @@ dissect_h245_presentationOrder(tvbuff_t *tvb, int offset, packet_info *pinfo, pr
 static int
 dissect_h245_offset_x(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree)
 {
-       offset=dissect_per_constrained_integer(tvb, offset, pinfo, 
+       offset=dissect_per_constrained_integer(tvb, offset, pinfo,
                tree, hf_h245_offset_x, -262144, 262143,
                NULL, NULL, FALSE);
 
@@ -9046,7 +9073,7 @@ dissect_h245_offset_x(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree
 static int
 dissect_h245_offset_y(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree)
 {
-       offset=dissect_per_constrained_integer(tvb, offset, pinfo, 
+       offset=dissect_per_constrained_integer(tvb, offset, pinfo,
                tree, hf_h245_offset_y, -262144, 262143,
                NULL, NULL, FALSE);
 
@@ -9060,7 +9087,7 @@ dissect_h245_offset_y(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree
 static int
 dissect_h245_scale_x(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree)
 {
-       offset=dissect_per_constrained_integer(tvb, offset, pinfo, 
+       offset=dissect_per_constrained_integer(tvb, offset, pinfo,
                tree, hf_h245_scale_x, 1, 255,
                NULL, NULL, FALSE);
 
@@ -9072,7 +9099,7 @@ dissect_h245_scale_x(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *
 static int
 dissect_h245_scale_y(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree)
 {
-       offset=dissect_per_constrained_integer(tvb, offset, pinfo, 
+       offset=dissect_per_constrained_integer(tvb, offset, pinfo,
                tree, hf_h245_scale_y, 1, 255,
                NULL, NULL, FALSE);
 
@@ -9083,15 +9110,15 @@ dissect_h245_scale_y(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *
 
 
 static per_sequence_t TransperencyParameters_sequence[] = {
-       { "presentationOrder", EXTENSION_ROOT, NOT_OPTIONAL,
+       { "presentationOrder", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_presentationOrder },
-       { "offset-x", EXTENSION_ROOT, NOT_OPTIONAL,
+       { "offset-x", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_offset_x },
-       { "offset-y", EXTENSION_ROOT, NOT_OPTIONAL,
+       { "offset-y", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_offset_y },
-       { "scale-x", EXTENSION_ROOT, NOT_OPTIONAL,
+       { "scale-x", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_scale_x },
-       { "scale-y", EXTENSION_ROOT, NOT_OPTIONAL,
+       { "scale-y", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_scale_y },
        { NULL, 0, 0, NULL }
 };
@@ -9109,7 +9136,7 @@ dissect_h245_TransperencyParameters(tvbuff_t *tvb, int offset, packet_info *pinf
 static int
 dissect_h245_sqcifAdditionalPictureMemory(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree)
 {
-       offset=dissect_per_constrained_integer(tvb, offset, pinfo, 
+       offset=dissect_per_constrained_integer(tvb, offset, pinfo,
                tree, hf_h245_sqcifAdditionalPictureMemory, 1, 256,
                NULL, NULL, FALSE);
 
@@ -9122,7 +9149,7 @@ dissect_h245_sqcifAdditionalPictureMemory(tvbuff_t *tvb, int offset, packet_info
 static int
 dissect_h245_qcifAdditionalPictureMemory(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree)
 {
-       offset=dissect_per_constrained_integer(tvb, offset, pinfo, 
+       offset=dissect_per_constrained_integer(tvb, offset, pinfo,
                tree, hf_h245_qcifAdditionalPictureMemory, 1, 256,
                NULL, NULL, FALSE);
 
@@ -9135,7 +9162,7 @@ dissect_h245_qcifAdditionalPictureMemory(tvbuff_t *tvb, int offset, packet_info
 static int
 dissect_h245_cifAdditionalPictureMemory(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree)
 {
-       offset=dissect_per_constrained_integer(tvb, offset, pinfo, 
+       offset=dissect_per_constrained_integer(tvb, offset, pinfo,
                tree, hf_h245_cifAdditionalPictureMemory, 1, 256,
                NULL, NULL, FALSE);
 
@@ -9148,7 +9175,7 @@ dissect_h245_cifAdditionalPictureMemory(tvbuff_t *tvb, int offset, packet_info *
 static int
 dissect_h245_cif4AdditionalPictureMemory(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree)
 {
-       offset=dissect_per_constrained_integer(tvb, offset, pinfo, 
+       offset=dissect_per_constrained_integer(tvb, offset, pinfo,
                tree, hf_h245_cif4AdditionalPictureMemory, 1, 256,
                NULL, NULL, FALSE);
 
@@ -9160,7 +9187,7 @@ dissect_h245_cif4AdditionalPictureMemory(tvbuff_t *tvb, int offset, packet_info
 static int
 dissect_h245_cif16AdditionalPictureMemory(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree)
 {
-       offset=dissect_per_constrained_integer(tvb, offset, pinfo, 
+       offset=dissect_per_constrained_integer(tvb, offset, pinfo,
                tree, hf_h245_cif16AdditionalPictureMemory, 1, 256,
                NULL, NULL, FALSE);
 
@@ -9172,7 +9199,7 @@ dissect_h245_cif16AdditionalPictureMemory(tvbuff_t *tvb, int offset, packet_info
 static int
 dissect_h245_bigCpfAdditionalPictureMemory(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree)
 {
-       offset=dissect_per_constrained_integer(tvb, offset, pinfo, 
+       offset=dissect_per_constrained_integer(tvb, offset, pinfo,
                tree, hf_h245_bigCpfAdditionalPictureMemory, 1, 256,
                NULL, NULL, FALSE);
 
@@ -9183,17 +9210,17 @@ dissect_h245_bigCpfAdditionalPictureMemory(tvbuff_t *tvb, int offset, packet_inf
 
 
 static per_sequence_t RefPictureSelection_additionalPictureMemory_sequence[] = {
-       { "sqcifAdditionalPictureMemory", EXTENSION_ROOT, OPTIONAL,
+       { "sqcifAdditionalPictureMemory", ASN1_EXTENSION_ROOT, ASN1_OPTIONAL,
                dissect_h245_sqcifAdditionalPictureMemory },
-       { "qcifAdditionalPictureMemory", EXTENSION_ROOT, OPTIONAL,
+       { "qcifAdditionalPictureMemory", ASN1_EXTENSION_ROOT, ASN1_OPTIONAL,
                dissect_h245_qcifAdditionalPictureMemory },
-       { "cifAdditionalPictureMemory", EXTENSION_ROOT, OPTIONAL,
+       { "cifAdditionalPictureMemory", ASN1_EXTENSION_ROOT, ASN1_OPTIONAL,
                dissect_h245_cifAdditionalPictureMemory },
-       { "cif4AdditionalPictureMemory", EXTENSION_ROOT, OPTIONAL,
+       { "cif4AdditionalPictureMemory", ASN1_EXTENSION_ROOT, ASN1_OPTIONAL,
                dissect_h245_cif4AdditionalPictureMemory },
-       { "cif16AdditionalPictureMemory", EXTENSION_ROOT, OPTIONAL,
+       { "cif16AdditionalPictureMemory", ASN1_EXTENSION_ROOT, ASN1_OPTIONAL,
                dissect_h245_cif16AdditionalPictureMemory },
-       { "bigCpfAdditionalPictureMemory", EXTENSION_ROOT, OPTIONAL,
+       { "bigCpfAdditionalPictureMemory", ASN1_EXTENSION_ROOT, ASN1_OPTIONAL,
                dissect_h245_bigCpfAdditionalPictureMemory},
        { NULL, 0, 0, NULL }
 };
@@ -9211,7 +9238,7 @@ dissect_h245_RefPictureSelection_additionalPictureMemory(tvbuff_t *tvb, int offs
 static int
 dissect_h245_mpuHorizMBs(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree)
 {
-       offset=dissect_per_constrained_integer(tvb, offset, pinfo, 
+       offset=dissect_per_constrained_integer(tvb, offset, pinfo,
                tree, hf_h245_mpuHorizMBs, 1, 128,
                NULL, NULL, FALSE);
 
@@ -9224,7 +9251,7 @@ dissect_h245_mpuHorizMBs(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tr
 static int
 dissect_h245_mpuVertMBs(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree)
 {
-       offset=dissect_per_constrained_integer(tvb, offset, pinfo, 
+       offset=dissect_per_constrained_integer(tvb, offset, pinfo,
                tree, hf_h245_mpuVertMBs, 1, 72,
                NULL, NULL, FALSE);
 
@@ -9237,7 +9264,7 @@ dissect_h245_mpuVertMBs(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tre
 static int
 dissect_h245_mpuTotalNumber(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree)
 {
-       offset=dissect_per_constrained_integer(tvb, offset, pinfo, 
+       offset=dissect_per_constrained_integer(tvb, offset, pinfo,
                tree, hf_h245_mpuTotalNumber, 1, 65536,
                NULL, NULL, FALSE);
 
@@ -9247,11 +9274,11 @@ dissect_h245_mpuTotalNumber(tvbuff_t *tvb, int offset, packet_info *pinfo, proto
 
 
 static per_sequence_t RefPictureSelection_enhancedReferencePicSelect_subPictureRemovalParameters_sequence[] = {
-       { "mpuHorizMBs", EXTENSION_ROOT, NOT_OPTIONAL,
+       { "mpuHorizMBs", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_mpuHorizMBs },
-       { "mpuVertMBs", EXTENSION_ROOT, NOT_OPTIONAL,
+       { "mpuVertMBs", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_mpuVertMBs},
-       { "mpuTotalNumber", EXTENSION_ROOT, NOT_OPTIONAL,
+       { "mpuTotalNumber", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_mpuTotalNumber},
        { NULL, 0, 0, NULL }
 };
@@ -9269,7 +9296,7 @@ dissect_h245_RefPictureSelection_enhancedReferencePicSelect_subPictureRemovalPar
 
 
 static per_sequence_t RefPictureSelection_enhancedReferencePicSelect_sequence[] = {
-       { "subPictureRemovalParameters", EXTENSION_ROOT, OPTIONAL,
+       { "subPictureRemovalParameters", ASN1_EXTENSION_ROOT, ASN1_OPTIONAL,
                dissect_h245_RefPictureSelection_enhancedReferencePicSelect_subPictureRemovalParameters },
        { NULL, 0, 0, NULL }
 };
@@ -9286,13 +9313,13 @@ dissect_h245_RefPictureSelection_enhancedReferencePicSelect(tvbuff_t *tvb, int o
 
 
 static per_sequence_t RefPictureSelection_sequence[] = {
-       { "additionalPictureMemory", EXTENSION_ROOT, OPTIONAL,
+       { "additionalPictureMemory", ASN1_EXTENSION_ROOT, ASN1_OPTIONAL,
                dissect_h245_RefPictureSelection_additionalPictureMemory },
-       { "videoMux", EXTENSION_ROOT, NOT_OPTIONAL, 
+       { "videoMux", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_videoMux },
-       { "videoBackChannelSend", EXTENSION_ROOT, NOT_OPTIONAL, 
+       { "videoBackChannelSend", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_RefPictureSelection_videoBackChannelSend },
-       { "enhancedReferencePicSelect", NOT_EXTENSION_ROOT, NOT_OPTIONAL,
+       { "enhancedReferencePicSelect", ASN1_NOT_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_RefPictureSelection_enhancedReferencePicSelect },
        { NULL, 0, 0, NULL }
 };
@@ -9309,7 +9336,7 @@ dissect_h245_RefPictureSelection(tvbuff_t *tvb, int offset, packet_info *pinfo,
 static int
 dissect_h245_clockConversionCode(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree)
 {
-       offset=dissect_per_constrained_integer(tvb, offset, pinfo, 
+       offset=dissect_per_constrained_integer(tvb, offset, pinfo,
                tree, hf_h245_clockConversionCode, 1000, 1001,
                NULL, NULL, FALSE);
 
@@ -9322,7 +9349,7 @@ dissect_h245_clockConversionCode(tvbuff_t *tvb, int offset, packet_info *pinfo,
 static int
 dissect_h245_clockDivisor(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree)
 {
-       offset=dissect_per_constrained_integer(tvb, offset, pinfo, 
+       offset=dissect_per_constrained_integer(tvb, offset, pinfo,
                tree, hf_h245_clockDivisor, 1, 127,
                NULL, NULL, FALSE);
 
@@ -9333,19 +9360,19 @@ dissect_h245_clockDivisor(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_t
 
 
 static per_sequence_t CustomPictureClockFrequency_sequence[] = {
-       { "clockConversionCode", EXTENSION_ROOT, NOT_OPTIONAL,
+       { "clockConversionCode", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_clockConversionCode },
-       { "clockDivisor", EXTENSION_ROOT, NOT_OPTIONAL,
+       { "clockDivisor", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_clockDivisor },
-       { "sqcifMPI", EXTENSION_ROOT, OPTIONAL,
+       { "sqcifMPI", ASN1_EXTENSION_ROOT, ASN1_OPTIONAL,
                dissect_h245_sqcifMPI_1_2048 },
-       { "qcifMPI", EXTENSION_ROOT, OPTIONAL,
+       { "qcifMPI", ASN1_EXTENSION_ROOT, ASN1_OPTIONAL,
                dissect_h245_qcifMPI_1_2048 },
-       { "cifMPI", EXTENSION_ROOT, OPTIONAL,
+       { "cifMPI", ASN1_EXTENSION_ROOT, ASN1_OPTIONAL,
                dissect_h245_cifMPI_1_2048 },
-       { "cif4MPI", EXTENSION_ROOT, OPTIONAL,
+       { "cif4MPI", ASN1_EXTENSION_ROOT, ASN1_OPTIONAL,
                dissect_h245_cif4MPI_1_2048 },
-       { "cif16MPI", EXTENSION_ROOT, OPTIONAL,
+       { "cif16MPI", ASN1_EXTENSION_ROOT, ASN1_OPTIONAL,
                dissect_h245_cif16MPI_1_2048 },
        { NULL, 0, 0, NULL }
 };
@@ -9363,7 +9390,7 @@ dissect_h245_CustomPictureClockFrequency(tvbuff_t *tvb, int offset, packet_info
 static int
 dissect_h245_maxCustomPictureWidth(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree)
 {
-       offset=dissect_per_constrained_integer(tvb, offset, pinfo, 
+       offset=dissect_per_constrained_integer(tvb, offset, pinfo,
                tree, hf_h245_maxCustomPictureWidth, 1, 2048,
                NULL, NULL, FALSE);
 
@@ -9374,7 +9401,7 @@ dissect_h245_maxCustomPictureWidth(tvbuff_t *tvb, int offset, packet_info *pinfo
 static int
 dissect_h245_minCustomPictureWidth(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree)
 {
-       offset=dissect_per_constrained_integer(tvb, offset, pinfo, 
+       offset=dissect_per_constrained_integer(tvb, offset, pinfo,
                tree, hf_h245_minCustomPictureWidth, 1, 2048,
                NULL, NULL, FALSE);
 
@@ -9387,7 +9414,7 @@ dissect_h245_minCustomPictureWidth(tvbuff_t *tvb, int offset, packet_info *pinfo
 static int
 dissect_h245_minCustomPictureHeight(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree)
 {
-       offset=dissect_per_constrained_integer(tvb, offset, pinfo, 
+       offset=dissect_per_constrained_integer(tvb, offset, pinfo,
                tree, hf_h245_minCustomPictureHeight, 1, 2048,
                NULL, NULL, FALSE);
 
@@ -9398,7 +9425,7 @@ dissect_h245_minCustomPictureHeight(tvbuff_t *tvb, int offset, packet_info *pinf
 static int
 dissect_h245_maxCustomPictureHeight(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree)
 {
-       offset=dissect_per_constrained_integer(tvb, offset, pinfo, 
+       offset=dissect_per_constrained_integer(tvb, offset, pinfo,
                tree, hf_h245_maxCustomPictureHeight, 1, 2048,
                NULL, NULL, FALSE);
 
@@ -9412,7 +9439,7 @@ dissect_h245_maxCustomPictureHeight(tvbuff_t *tvb, int offset, packet_info *pinf
 static int
 dissect_h245_standardMPI(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree)
 {
-       offset=dissect_per_constrained_integer(tvb, offset, pinfo, 
+       offset=dissect_per_constrained_integer(tvb, offset, pinfo,
                tree, hf_h245_standardMPI, 1, 31,
                NULL, NULL, FALSE);
 
@@ -9425,7 +9452,7 @@ dissect_h245_standardMPI(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tr
 static int
 dissect_h245_customMPI(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree)
 {
-       offset=dissect_per_constrained_integer(tvb, offset, pinfo, 
+       offset=dissect_per_constrained_integer(tvb, offset, pinfo,
                tree, hf_h245_customMPI, 1, 2048,
                NULL, NULL, FALSE);
 
@@ -9436,11 +9463,11 @@ dissect_h245_customMPI(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree
 
 
 static per_sequence_t CustomPictureFormat_mPI_customPCF_sequence[] = {
-       { "clockConversionCode", EXTENSION_ROOT, NOT_OPTIONAL,
+       { "clockConversionCode", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_clockConversionCode },
-       { "clockDivisor", EXTENSION_ROOT, NOT_OPTIONAL,
+       { "clockDivisor", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_clockDivisor },
-       { "customMPI", EXTENSION_ROOT, NOT_OPTIONAL,
+       { "customMPI", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_customMPI },
        { NULL, 0, 0, NULL }
 };
@@ -9457,9 +9484,9 @@ dissect_h245_CustomPictureFormat_mPI_customPCF(tvbuff_t *tvb, int offset, packet
 static int dissect_h245_customPCF(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree);
 
 static per_sequence_t CustomPictureFormat_mPI_sequence[] = {
-       { "standardMPI", EXTENSION_ROOT, OPTIONAL, 
+       { "standardMPI", ASN1_EXTENSION_ROOT, ASN1_OPTIONAL,
                dissect_h245_standardMPI},
-       { "customPCF", EXTENSION_ROOT, OPTIONAL,
+       { "customPCF", ASN1_EXTENSION_ROOT, ASN1_OPTIONAL,
                dissect_h245_customPCF },
        { NULL, 0, 0, NULL }
 };
@@ -9477,7 +9504,7 @@ dissect_h245_CustomPictureFormat_mPI(tvbuff_t *tvb, int offset, packet_info *pin
 static int
 dissect_h245_width(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree)
 {
-       offset=dissect_per_constrained_integer(tvb, offset, pinfo, 
+       offset=dissect_per_constrained_integer(tvb, offset, pinfo,
                tree, hf_h245_width, 1, 255,
                NULL, NULL, FALSE);
 
@@ -9489,7 +9516,7 @@ dissect_h245_width(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tr
 static int
 dissect_h245_height(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree)
 {
-       offset=dissect_per_constrained_integer(tvb, offset, pinfo, 
+       offset=dissect_per_constrained_integer(tvb, offset, pinfo,
                tree, hf_h245_height, 1, 255,
                NULL, NULL, FALSE);
 
@@ -9500,9 +9527,9 @@ dissect_h245_height(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *t
 
 
 static per_sequence_t CustomPictureFormat_pixelAspectInformation_extendedPAR_sequence[] = {
-       { "width", EXTENSION_ROOT, NOT_OPTIONAL,
+       { "width", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_width },
-       { "height", EXTENSION_ROOT, NOT_OPTIONAL,
+       { "height", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_height},
        { NULL, 0, 0, NULL }
 };
@@ -9520,7 +9547,7 @@ dissect_h245_CustomPictureFormat_pixelAspectInformation_extendedPAR(tvbuff_t *tv
 static int
 dissect_h245_pictureRate(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree)
 {
-       offset=dissect_per_constrained_integer(tvb, offset, pinfo, 
+       offset=dissect_per_constrained_integer(tvb, offset, pinfo,
                tree, hf_h245_pictureRate, 0, 15,
                NULL, NULL, FALSE);
 
@@ -9531,19 +9558,19 @@ dissect_h245_pictureRate(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tr
 
 
 static per_sequence_t IS11172VideoMode_sequence[] = {
-       { "constrainedBitstream", EXTENSION_ROOT, NOT_OPTIONAL, 
+       { "constrainedBitstream", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_constrainedBitstream },
-       { "videoBitRate", EXTENSION_ROOT, OPTIONAL,
+       { "videoBitRate", ASN1_EXTENSION_ROOT, ASN1_OPTIONAL,
                dissect_h245_videoBitRate },
-       { "vbvBufferSize", EXTENSION_ROOT, OPTIONAL, 
+       { "vbvBufferSize", ASN1_EXTENSION_ROOT, ASN1_OPTIONAL,
                dissect_h245_vbvBufferSize },
-       { "samplesPerLine", EXTENSION_ROOT, OPTIONAL,
+       { "samplesPerLine", ASN1_EXTENSION_ROOT, ASN1_OPTIONAL,
                dissect_h245_samplesPerLine },
-       { "linesPerFrame", EXTENSION_ROOT, OPTIONAL,
+       { "linesPerFrame", ASN1_EXTENSION_ROOT, ASN1_OPTIONAL,
                dissect_h245_linesPerFrame },
-       { "pictureRate", EXTENSION_ROOT, OPTIONAL, 
+       { "pictureRate", ASN1_EXTENSION_ROOT, ASN1_OPTIONAL,
                dissect_h245_pictureRate},
-       { "luminanceSampleRate", EXTENSION_ROOT, OPTIONAL,
+       { "luminanceSampleRate", ASN1_EXTENSION_ROOT, ASN1_OPTIONAL,
                dissect_h245_luminanceSampleRate },
        { NULL, 0, 0, NULL }
 };
@@ -9558,21 +9585,21 @@ dissect_h245_IS11172VideoMode(tvbuff_t *tvb, int offset, packet_info *pinfo, pro
 
 
 static per_sequence_t IS11172VideoCapability_sequence[] = {
-       { "constrainedBitstream", EXTENSION_ROOT, NOT_OPTIONAL,
+       { "constrainedBitstream", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_constrainedBitstream },
-       { "videoBitRate", EXTENSION_ROOT, OPTIONAL, 
+       { "videoBitRate", ASN1_EXTENSION_ROOT, ASN1_OPTIONAL,
                dissect_h245_videoBitRate },
-       { "vbvBufferSize", EXTENSION_ROOT, OPTIONAL, 
+       { "vbvBufferSize", ASN1_EXTENSION_ROOT, ASN1_OPTIONAL,
                dissect_h245_vbvBufferSize },
-       { "samplesPerLine", EXTENSION_ROOT, OPTIONAL,
+       { "samplesPerLine", ASN1_EXTENSION_ROOT, ASN1_OPTIONAL,
                dissect_h245_samplesPerLine },
-       { "linesPerFrame", EXTENSION_ROOT, OPTIONAL,
+       { "linesPerFrame", ASN1_EXTENSION_ROOT, ASN1_OPTIONAL,
                dissect_h245_linesPerFrame },
-       { "pictureRate", EXTENSION_ROOT, OPTIONAL, 
+       { "pictureRate", ASN1_EXTENSION_ROOT, ASN1_OPTIONAL,
                dissect_h245_pictureRate },
-       { "luminanceSampleRate", EXTENSION_ROOT, OPTIONAL,
+       { "luminanceSampleRate", ASN1_EXTENSION_ROOT, ASN1_OPTIONAL,
                dissect_h245_luminanceSampleRate },
-       { "videoBadMBsCap", NOT_EXTENSION_ROOT, NOT_OPTIONAL, 
+       { "videoBadMBsCap", ASN1_NOT_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_videoBadMBsCap },
        { NULL, 0, 0, NULL }
 };
@@ -9590,7 +9617,7 @@ dissect_h245_IS11172VideoCapability(tvbuff_t *tvb, int offset, packet_info *pinf
 static int
 dissect_h245_g711Alaw64k(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree)
 {
-       offset=dissect_per_constrained_integer(tvb, offset, pinfo, 
+       offset=dissect_per_constrained_integer(tvb, offset, pinfo,
                tree, hf_h245_g711Alaw64k, 1, 256,
                NULL, NULL, FALSE);
 
@@ -9602,7 +9629,7 @@ dissect_h245_g711Alaw64k(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tr
 static int
 dissect_h245_g711Alaw56k(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree)
 {
-       offset=dissect_per_constrained_integer(tvb, offset, pinfo, 
+       offset=dissect_per_constrained_integer(tvb, offset, pinfo,
                tree, hf_h245_g711Alaw56k, 1, 256,
                NULL, NULL, FALSE);
 
@@ -9614,7 +9641,7 @@ dissect_h245_g711Alaw56k(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tr
 static int
 dissect_h245_g711Ulaw64k(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree)
 {
-       offset=dissect_per_constrained_integer(tvb, offset, pinfo, 
+       offset=dissect_per_constrained_integer(tvb, offset, pinfo,
                tree, hf_h245_g711Ulaw64k, 1, 256,
                NULL, NULL, FALSE);
 
@@ -9626,7 +9653,7 @@ dissect_h245_g711Ulaw64k(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tr
 static int
 dissect_h245_g711Ulaw56k(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree)
 {
-       offset=dissect_per_constrained_integer(tvb, offset, pinfo, 
+       offset=dissect_per_constrained_integer(tvb, offset, pinfo,
                tree, hf_h245_g711Ulaw56k, 1, 256,
                NULL, NULL, FALSE);
 
@@ -9639,7 +9666,7 @@ dissect_h245_g711Ulaw56k(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tr
 static int
 dissect_h245_g722_64k(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree)
 {
-       offset=dissect_per_constrained_integer(tvb, offset, pinfo, 
+       offset=dissect_per_constrained_integer(tvb, offset, pinfo,
                tree, hf_h245_g722_64k, 1, 256,
                NULL, NULL, FALSE);
 
@@ -9651,7 +9678,7 @@ dissect_h245_g722_64k(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree
 static int
 dissect_h245_g722_56k(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree)
 {
-       offset=dissect_per_constrained_integer(tvb, offset, pinfo, 
+       offset=dissect_per_constrained_integer(tvb, offset, pinfo,
                tree, hf_h245_g722_56k, 1, 256,
                NULL, NULL, FALSE);
 
@@ -9664,7 +9691,7 @@ dissect_h245_g722_56k(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree
 static int
 dissect_h245_g722_48k(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree)
 {
-       offset=dissect_per_constrained_integer(tvb, offset, pinfo, 
+       offset=dissect_per_constrained_integer(tvb, offset, pinfo,
                tree, hf_h245_g722_48k, 1, 256,
                NULL, NULL, FALSE);
 
@@ -9678,7 +9705,7 @@ dissect_h245_g722_48k(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree
 static int
 dissect_h245_maxAl_sduAudioFrames(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree)
 {
-       offset=dissect_per_constrained_integer(tvb, offset, pinfo, 
+       offset=dissect_per_constrained_integer(tvb, offset, pinfo,
                tree, hf_h245_maxAl_sduAudioFrames, 1, 256,
                NULL, NULL, FALSE);
 
@@ -9688,9 +9715,9 @@ dissect_h245_maxAl_sduAudioFrames(tvbuff_t *tvb, int offset, packet_info *pinfo,
 
 
 static per_sequence_t AudioCapability_g7231_sequence[] = {
-       { "maxAl-sduAudioFrames", NO_EXTENSIONS, NOT_OPTIONAL, 
+       { "maxAl-sduAudioFrames", ASN1_NO_EXTENSIONS, ASN1_NOT_OPTIONAL,
                dissect_h245_maxAl_sduAudioFrames },
-       { "silenceSuppression", NO_EXTENSIONS, NOT_OPTIONAL, 
+       { "silenceSuppression", ASN1_NO_EXTENSIONS, ASN1_NOT_OPTIONAL,
                dissect_h245_silenceSuppression },
        { NULL, 0, 0, NULL }
 };
@@ -9708,7 +9735,7 @@ dissect_h245_AudioCapability_g7231(tvbuff_t *tvb, int offset, packet_info *pinfo
 static int
 dissect_h245_g728(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree)
 {
-       offset=dissect_per_constrained_integer(tvb, offset, pinfo, 
+       offset=dissect_per_constrained_integer(tvb, offset, pinfo,
                tree, hf_h245_g728, 1, 256,
                NULL, NULL, FALSE);
 
@@ -9720,7 +9747,7 @@ dissect_h245_g728(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tre
 static int
 dissect_h245_g729(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree)
 {
-       offset=dissect_per_constrained_integer(tvb, offset, pinfo, 
+       offset=dissect_per_constrained_integer(tvb, offset, pinfo,
                tree, hf_h245_g729, 1, 256,
                NULL, NULL, FALSE);
 
@@ -9732,7 +9759,7 @@ dissect_h245_g729(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tre
 static int
 dissect_h245_g729AnnexA(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree)
 {
-       offset=dissect_per_constrained_integer(tvb, offset, pinfo, 
+       offset=dissect_per_constrained_integer(tvb, offset, pinfo,
                tree, hf_h245_g729AnnexA, 1, 256,
                NULL, NULL, FALSE);
 
@@ -9745,7 +9772,7 @@ dissect_h245_g729AnnexA(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tre
 static int
 dissect_h245_g729wAnnexB(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree)
 {
-       offset=dissect_per_constrained_integer(tvb, offset, pinfo, 
+       offset=dissect_per_constrained_integer(tvb, offset, pinfo,
                tree, hf_h245_g729wAnnexB, 1, 256,
                NULL, NULL, FALSE);
 
@@ -9758,7 +9785,7 @@ dissect_h245_g729wAnnexB(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tr
 static int
 dissect_h245_g729AnnexAwAnnexB(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree)
 {
-       offset=dissect_per_constrained_integer(tvb, offset, pinfo, 
+       offset=dissect_per_constrained_integer(tvb, offset, pinfo,
                tree, hf_h245_g729AnnexAwAnnexB, 1, 256,
                NULL, NULL, FALSE);
 
@@ -9771,7 +9798,7 @@ dissect_h245_g729AnnexAwAnnexB(tvbuff_t *tvb, int offset, packet_info *pinfo, pr
 static int
 dissect_h245_audioUnit(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree)
 {
-       offset=dissect_per_constrained_integer(tvb, offset, pinfo, 
+       offset=dissect_per_constrained_integer(tvb, offset, pinfo,
                tree, hf_h245_audioUnit, 1, 256,
                NULL, NULL, FALSE);
 
@@ -9782,21 +9809,21 @@ dissect_h245_audioUnit(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree
 
 
 static per_sequence_t G729Extensions_sequence[] = {
-       { "audioUnit", EXTENSION_ROOT, OPTIONAL,
+       { "audioUnit", ASN1_EXTENSION_ROOT, ASN1_OPTIONAL,
                dissect_h245_audioUnit },
-       { "annexA", EXTENSION_ROOT, NOT_OPTIONAL, 
+       { "annexA", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_annexA },
-       { "annexB", EXTENSION_ROOT, NOT_OPTIONAL, 
+       { "annexB", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_annexB },
-       { "annexD", EXTENSION_ROOT, NOT_OPTIONAL, 
+       { "annexD", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_annexD },
-       { "annexE", EXTENSION_ROOT, NOT_OPTIONAL, 
+       { "annexE", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_annexE },
-       { "annexF", EXTENSION_ROOT, NOT_OPTIONAL, 
+       { "annexF", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_annexF },
-       { "annexG", EXTENSION_ROOT, NOT_OPTIONAL, 
+       { "annexG", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_annexG },
-       { "annexH", EXTENSION_ROOT, NOT_OPTIONAL, 
+       { "annexH", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_annexH },
        { NULL, 0, 0, NULL }
 };
@@ -9814,7 +9841,7 @@ dissect_h245_G729Extensions(tvbuff_t *tvb, int offset, packet_info *pinfo, proto
 static int
 dissect_h245_highRateMode0(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree)
 {
-       offset=dissect_per_constrained_integer(tvb, offset, pinfo, 
+       offset=dissect_per_constrained_integer(tvb, offset, pinfo,
                tree, hf_h245_highRateMode0, 27, 78,
                NULL, NULL, FALSE);
 
@@ -9825,7 +9852,7 @@ dissect_h245_highRateMode0(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_
 static int
 dissect_h245_highRateMode1(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree)
 {
-       offset=dissect_per_constrained_integer(tvb, offset, pinfo, 
+       offset=dissect_per_constrained_integer(tvb, offset, pinfo,
                tree, hf_h245_highRateMode1, 27, 78,
                NULL, NULL, FALSE);
 
@@ -9839,7 +9866,7 @@ dissect_h245_highRateMode1(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_
 static int
 dissect_h245_lowRateMode0(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree)
 {
-       offset=dissect_per_constrained_integer(tvb, offset, pinfo, 
+       offset=dissect_per_constrained_integer(tvb, offset, pinfo,
                tree, hf_h245_lowRateMode0, 23, 66,
                NULL, NULL, FALSE);
 
@@ -9850,7 +9877,7 @@ dissect_h245_lowRateMode0(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_t
 static int
 dissect_h245_lowRateMode1(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree)
 {
-       offset=dissect_per_constrained_integer(tvb, offset, pinfo, 
+       offset=dissect_per_constrained_integer(tvb, offset, pinfo,
                tree, hf_h245_lowRateMode1, 23, 66,
                NULL, NULL, FALSE);
 
@@ -9863,7 +9890,7 @@ dissect_h245_lowRateMode1(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_t
 static int
 dissect_h245_sidMode0(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree)
 {
-       offset=dissect_per_constrained_integer(tvb, offset, pinfo, 
+       offset=dissect_per_constrained_integer(tvb, offset, pinfo,
                tree, hf_h245_sidMode0, 6, 17,
                NULL, NULL, FALSE);
 
@@ -9874,7 +9901,7 @@ dissect_h245_sidMode0(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree
 static int
 dissect_h245_sidMode1(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree)
 {
-       offset=dissect_per_constrained_integer(tvb, offset, pinfo, 
+       offset=dissect_per_constrained_integer(tvb, offset, pinfo,
                tree, hf_h245_sidMode1, 6, 17,
                NULL, NULL, FALSE);
 
@@ -9885,17 +9912,17 @@ dissect_h245_sidMode1(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree
 
 
 static per_sequence_t G7231AnnexCCapability_g723AnnexCAudioMode_sequence[] = {
-       { "highRateMode0", EXTENSION_ROOT, NOT_OPTIONAL,
+       { "highRateMode0", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_highRateMode0 },
-       { "highRateMode1", EXTENSION_ROOT, NOT_OPTIONAL,
+       { "highRateMode1", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_highRateMode1 },
-       { "lowRateMode0", EXTENSION_ROOT, NOT_OPTIONAL,
+       { "lowRateMode0", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_lowRateMode0 },
-       { "lowRateMode1", EXTENSION_ROOT, NOT_OPTIONAL,
+       { "lowRateMode1", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_lowRateMode1 },
-       { "sidMode0", EXTENSION_ROOT, NOT_OPTIONAL,
+       { "sidMode0", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_sidMode0 },
-       { "sidMode1", EXTENSION_ROOT, NOT_OPTIONAL,
+       { "sidMode1", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_sidMode1 },
        { NULL, 0, 0, NULL }
 };
@@ -9911,11 +9938,11 @@ dissect_h245_G7231AnnexCCapability_g723AnnexCAudioMode(tvbuff_t *tvb, int offset
 
 
 static per_sequence_t G7231AnnexCCapability_sequence[] = {
-       { "maxAl-sduAudioFrames", EXTENSION_ROOT, NOT_OPTIONAL, 
+       { "maxAl-sduAudioFrames", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_maxAl_sduAudioFrames },
-       { "silenceSuppression", EXTENSION_ROOT, NOT_OPTIONAL, 
+       { "silenceSuppression", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_silenceSuppression },
-       { "g723AnnexCAudioMode", EXTENSION_ROOT, OPTIONAL,
+       { "g723AnnexCAudioMode", ASN1_EXTENSION_ROOT, ASN1_OPTIONAL,
                dissect_h245_G7231AnnexCCapability_g723AnnexCAudioMode },
        { NULL, 0, 0, NULL }
 };
@@ -9930,17 +9957,17 @@ dissect_h245_G7231AnnexCCapability(tvbuff_t *tvb, int offset, packet_info *pinfo
 
 
 static per_sequence_t G7231AnnexCMode_g723AnnexCAudioMode_sequence[] = {
-       { "highRateMode0", EXTENSION_ROOT, NOT_OPTIONAL,
+       { "highRateMode0", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                        dissect_h245_highRateMode0 },
-       { "highRateMode1", EXTENSION_ROOT, NOT_OPTIONAL,
+       { "highRateMode1", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                        dissect_h245_highRateMode1 },
-       { "lowRateMode0", EXTENSION_ROOT, NOT_OPTIONAL,
+       { "lowRateMode0", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                        dissect_h245_lowRateMode0 },
-       { "lowRateMode1", EXTENSION_ROOT, NOT_OPTIONAL,
+       { "lowRateMode1", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                        dissect_h245_lowRateMode0 },
-       { "sidMode0", EXTENSION_ROOT, NOT_OPTIONAL,
+       { "sidMode0", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                        dissect_h245_sidMode0 },
-       { "sidMode1", EXTENSION_ROOT, NOT_OPTIONAL,
+       { "sidMode1", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                        dissect_h245_sidMode1 },
        { NULL, 0, 0, NULL }
 };
@@ -9956,11 +9983,11 @@ dissect_h245_G7231AnnexCMode_g723AnnexCAudioMode(tvbuff_t *tvb, int offset, pack
 
 
 static per_sequence_t G7231AnnexCMode_sequence[] = {
-       { "maxAl-sduAudioFrames", EXTENSION_ROOT, NOT_OPTIONAL, 
+       { "maxAl-sduAudioFrames", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_maxAl_sduAudioFrames },
-       { "silenceSupression", EXTENSION_ROOT, NOT_OPTIONAL, 
+       { "silenceSupression", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_silenceSuppression },
-       { "g723AnnexCAudioMode", EXTENSION_ROOT, NOT_OPTIONAL,
+       { "g723AnnexCAudioMode", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_G7231AnnexCMode_g723AnnexCAudioMode },
        { NULL, 0, 0, NULL }
 };
@@ -9978,7 +10005,7 @@ dissect_h245_G7231AnnexCMode(tvbuff_t *tvb, int offset, packet_info *pinfo, prot
 static int
 dissect_h245_audioUnitSize(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree)
 {
-       offset=dissect_per_constrained_integer(tvb, offset, pinfo, 
+       offset=dissect_per_constrained_integer(tvb, offset, pinfo,
                tree, hf_h245_audioUnitSize, 1, 256,
                NULL, NULL, FALSE);
 
@@ -9990,11 +10017,11 @@ dissect_h245_audioUnitSize(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_
 
 
 static per_sequence_t GSMAudioCapability_sequence[] = {
-       { "audioUnitSize", EXTENSION_ROOT, NOT_OPTIONAL,
+       { "audioUnitSize", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_audioUnitSize },
-       { "comfortNoice", EXTENSION_ROOT, NOT_OPTIONAL, 
+       { "comfortNoice", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_comfortNoise },
-       { "scrambled", EXTENSION_ROOT, NOT_OPTIONAL,
+       { "scrambled", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_scrambled },
        { NULL, 0, 0, NULL }
 };
@@ -10014,7 +10041,7 @@ static int
 dissect_h245_maxBitRate_4294967295UL(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree)
 {
        /* XXX unit is 100bit/s */
-       offset=dissect_per_constrained_integer(tvb, offset, pinfo, 
+       offset=dissect_per_constrained_integer(tvb, offset, pinfo,
                tree, hf_h245_maxBitRate_4294967295UL, 0, 4294967295UL,
                NULL, NULL, FALSE);
 
@@ -10028,7 +10055,7 @@ dissect_h245_maxBitRate_4294967295UL(tvbuff_t *tvb, int offset, packet_info *pin
 static int
 dissect_h245_numberOfCodewords(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree)
 {
-       offset=dissect_per_constrained_integer(tvb, offset, pinfo, 
+       offset=dissect_per_constrained_integer(tvb, offset, pinfo,
                tree, hf_h245_numberOfCodewords, 1, 65536,
                NULL, NULL, FALSE);
 
@@ -10041,7 +10068,7 @@ dissect_h245_numberOfCodewords(tvbuff_t *tvb, int offset, packet_info *pinfo, pr
 static int
 dissect_h245_maximumStringLength(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree)
 {
-       offset=dissect_per_constrained_integer(tvb, offset, pinfo, 
+       offset=dissect_per_constrained_integer(tvb, offset, pinfo,
                tree, hf_h245_maximumStringLength, 1, 256,
                NULL, NULL, FALSE);
 
@@ -10053,9 +10080,9 @@ dissect_h245_maximumStringLength(tvbuff_t *tvb, int offset, packet_info *pinfo,
 
 
 static per_sequence_t V42bis_sequence[] = {
-       { "numberOfCodewords", EXTENSION_ROOT, NOT_OPTIONAL,
+       { "numberOfCodewords", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_numberOfCodewords },
-       { "maximumStringLength", EXTENSION_ROOT, NOT_OPTIONAL,
+       { "maximumStringLength", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_maximumStringLength },
        { NULL, 0, 0, NULL }
 };
@@ -10074,7 +10101,7 @@ static const value_string CompressionType_vals[] = {
        {  0, NULL }
 };
 static per_choice_t CompressionType_choice[] = {
-       {  0, "v42bis", EXTENSION_ROOT,
+       {  0, "v42bis", ASN1_EXTENSION_ROOT,
                dissect_h245_V42bis },
        {  0, NULL, 0, NULL }
 };
@@ -10097,11 +10124,11 @@ static const value_string DataProtocolCapability_v76wCompression_vals[] = {
        {  0, NULL }
 };
 static per_choice_t DataProtocolCapability_v76wCompression_choice[] = {
-       {  0, "transmitCompression", EXTENSION_ROOT,
+       {  0, "transmitCompression", ASN1_EXTENSION_ROOT,
                dissect_h245_CompressionType },
-       {  1, "receiveCompression", EXTENSION_ROOT,
+       {  1, "receiveCompression", ASN1_EXTENSION_ROOT,
                dissect_h245_CompressionType },
-       {  2, "transmitAndReceiveCompression", EXTENSION_ROOT,
+       {  2, "transmitAndReceiveCompression", ASN1_EXTENSION_ROOT,
                dissect_h245_CompressionType },
        {  0, NULL, 0, NULL }
 };
@@ -10120,7 +10147,7 @@ dissect_h245_DataProtocolCapability_v76wCompression(tvbuff_t *tvb, int offset, p
 static int
 dissect_h245_version(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree)
 {
-       offset=dissect_per_constrained_integer(tvb, offset, pinfo, 
+       offset=dissect_per_constrained_integer(tvb, offset, pinfo,
                tree, hf_h245_version, 0, 255,
                NULL, NULL, FALSE);
 
@@ -10131,19 +10158,19 @@ dissect_h245_version(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *
 
 static int dissect_h245_T38FaxUdpOptions(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree);
 static per_sequence_t T38FaxProfile_sequence[] = {
-       { "fillBitRemoval", EXTENSION_ROOT, NOT_OPTIONAL, 
+       { "fillBitRemoval", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_fillBitRemoval },
-       { "transcodingJBIG", EXTENSION_ROOT, NOT_OPTIONAL,
+       { "transcodingJBIG", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_transcodingJBIG },
-       { "transcodingMMR", EXTENSION_ROOT, NOT_OPTIONAL,
+       { "transcodingMMR", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_transcodingMMR },
-       { "version", NOT_EXTENSION_ROOT, NOT_OPTIONAL,
+       { "version", ASN1_NOT_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_version },
-       { "t38FaxRateManagement", NOT_EXTENSION_ROOT, NOT_OPTIONAL, 
+       { "t38FaxRateManagement", ASN1_NOT_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_T38FaxRateManagement },
-       { "t38FaxUdpOptions", NOT_EXTENSION_ROOT, OPTIONAL, 
+       { "t38FaxUdpOptions", ASN1_NOT_EXTENSION_ROOT, ASN1_OPTIONAL,
                dissect_h245_T38FaxUdpOptions },
-       { "t38FaxTcpOptions", NOT_EXTENSION_ROOT, OPTIONAL, 
+       { "t38FaxTcpOptions", ASN1_NOT_EXTENSION_ROOT, ASN1_OPTIONAL,
                dissect_h245_T38FaxTcpOptions },
        { NULL, 0, 0, NULL }
 };
@@ -10161,7 +10188,7 @@ dissect_h245_T38FaxProfile(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_
 static int
 dissect_h245_standard_0_127(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree)
 {
-       offset=dissect_per_constrained_integer(tvb, offset, pinfo, 
+       offset=dissect_per_constrained_integer(tvb, offset, pinfo,
                tree, hf_h245_standard_0_127, 0, 127,
                NULL, NULL, FALSE);
 
@@ -10174,7 +10201,7 @@ dissect_h245_standard_0_127(tvbuff_t *tvb, int offset, packet_info *pinfo, proto
 static int
 dissect_h245_booleanArray(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree)
 {
-       offset=dissect_per_constrained_integer(tvb, offset, pinfo, 
+       offset=dissect_per_constrained_integer(tvb, offset, pinfo,
                tree, hf_h245_booleanArray, 0, 255,
                NULL, NULL, FALSE);
 
@@ -10187,7 +10214,7 @@ dissect_h245_booleanArray(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_t
 static int
 dissect_h245_unsignedMin(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree)
 {
-       offset=dissect_per_constrained_integer(tvb, offset, pinfo, 
+       offset=dissect_per_constrained_integer(tvb, offset, pinfo,
                tree, hf_h245_unsignedMin, 0, 65535,
                NULL, NULL, FALSE);
 
@@ -10198,7 +10225,7 @@ dissect_h245_unsignedMin(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tr
 static int
 dissect_h245_unsignedMax(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree)
 {
-       offset=dissect_per_constrained_integer(tvb, offset, pinfo, 
+       offset=dissect_per_constrained_integer(tvb, offset, pinfo,
                tree, hf_h245_unsignedMax, 0, 65535,
                NULL, NULL, FALSE);
 
@@ -10211,7 +10238,7 @@ dissect_h245_unsignedMax(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tr
 static int
 dissect_h245_unsigned32Min(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree)
 {
-       offset=dissect_per_constrained_integer(tvb, offset, pinfo, 
+       offset=dissect_per_constrained_integer(tvb, offset, pinfo,
                tree, hf_h245_unsigned32Min, 0, 4294967295UL,
                NULL, NULL, FALSE);
 
@@ -10222,7 +10249,7 @@ dissect_h245_unsigned32Min(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_
 static int
 dissect_h245_unsigned32Max(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree)
 {
-       offset=dissect_per_constrained_integer(tvb, offset, pinfo, 
+       offset=dissect_per_constrained_integer(tvb, offset, pinfo,
                tree, hf_h245_unsigned32Max, 0, 4294967295UL,
                NULL, NULL, FALSE);
 
@@ -10235,7 +10262,7 @@ dissect_h245_unsigned32Max(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_
 static int
 dissect_h245_dynamicRTPPayloadType(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree)
 {
-       offset=dissect_per_constrained_integer(tvb, offset, pinfo, 
+       offset=dissect_per_constrained_integer(tvb, offset, pinfo,
                tree, hf_h245_dynamicRTPPayloadType, 96, 127,
                NULL, NULL, FALSE);
 
@@ -10246,7 +10273,7 @@ dissect_h245_dynamicRTPPayloadType(tvbuff_t *tvb, int offset, packet_info *pinfo
 
 
 static per_sequence_t AudioToneCapability_sequence[] = {
-       { "dynamicRTPPayloadType", EXTENSION_ROOT, NOT_OPTIONAL,
+       { "dynamicRTPPayloadType", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_dynamicRTPPayloadType },
        { NULL, 0, 0, NULL }
 };
@@ -10262,7 +10289,7 @@ dissect_h245_AudioToneCapability(tvbuff_t *tvb, int offset, packet_info *pinfo,
 
 
 static per_sequence_t NoPTAudioToneCapability_sequence[] = {
-       { NULL, EXTENSION_ROOT, 0, NULL }
+       { NULL, ASN1_EXTENSION_ROOT, 0, NULL }
 };
 static int
 dissect_h245_NoPTAudioToneCapability(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree)
@@ -10279,7 +10306,7 @@ dissect_h245_NoPTAudioToneCapability(tvbuff_t *tvb, int offset, packet_info *pin
 static int
 dissect_h245_portNumber(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree)
 {
-       offset=dissect_per_constrained_integer(tvb, offset, pinfo, 
+       offset=dissect_per_constrained_integer(tvb, offset, pinfo,
                tree, hf_h245_portNumber, 0, 65535,
                NULL, NULL, FALSE);
 
@@ -10292,7 +10319,7 @@ dissect_h245_portNumber(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tre
 static int
 dissect_h245_resourceID(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree)
 {
-       offset=dissect_per_constrained_integer(tvb, offset, pinfo, 
+       offset=dissect_per_constrained_integer(tvb, offset, pinfo,
                tree, hf_h245_resourceID, 0, 65535,
                NULL, NULL, FALSE);
 
@@ -10309,11 +10336,11 @@ static const value_string FlowControlCommand_scope_vals[] = {
        {  0, NULL }
 };
 static per_choice_t FlowControlCommand_scope_choice[] = {
-       {  0, "logicalChannelNumber", NO_EXTENSIONS, 
+       {  0, "logicalChannelNumber", ASN1_NO_EXTENSIONS,
                        dissect_h245_LogicalChannelNumber },
-       {  1, "resourceID", NO_EXTENSIONS,
+       {  1, "resourceID", ASN1_NO_EXTENSIONS,
                        dissect_h245_resourceID },
-       {  2, "wholeMultiplex", NO_EXTENSIONS, 
+       {  2, "wholeMultiplex", ASN1_NO_EXTENSIONS,
                        dissect_h245_NULL },
        {  0, NULL, 0, NULL }
 };
@@ -10337,11 +10364,11 @@ static const value_string JitterIndication_scope_vals[] = {
        {  0, NULL }
 };
 static per_choice_t JitterIndication_scope_choice[] = {
-       {  0, "logicalChannelNumber", NO_EXTENSIONS, 
+       {  0, "logicalChannelNumber", ASN1_NO_EXTENSIONS,
                        dissect_h245_LogicalChannelNumber },
-       {  1, "resourceID", NO_EXTENSIONS,
+       {  1, "resourceID", ASN1_NO_EXTENSIONS,
                        dissect_h245_resourceID },
-       {  2, "wholeMultiplex", NO_EXTENSIONS, 
+       {  2, "wholeMultiplex", ASN1_NO_EXTENSIONS,
                        dissect_h245_NULL },
        {  0, NULL, 0, NULL }
 };
@@ -10364,11 +10391,11 @@ static const value_string FlowControlIndication_scope_vals[] = {
        {  0, NULL }
 };
 static per_choice_t FlowControlIndication_scope_choice[] = {
-       {  0, "logicalChannelNumber", NO_EXTENSIONS, 
+       {  0, "logicalChannelNumber", ASN1_NO_EXTENSIONS,
                        dissect_h245_LogicalChannelNumber },
-       {  1, "resourceID", NO_EXTENSIONS,
+       {  1, "resourceID", ASN1_NO_EXTENSIONS,
                        dissect_h245_resourceID },
-       {  2, "wholeMultiplex", NO_EXTENSIONS, 
+       {  2, "wholeMultiplex", ASN1_NO_EXTENSIONS,
                        dissect_h245_NULL },
        {  0, NULL, 0, NULL }
 };
@@ -10384,19 +10411,19 @@ dissect_h245_FlowControlIndication_scope(tvbuff_t *tvb, int offset, packet_info
 
 
 static per_sequence_t NewATMVCIndication_sequence[] = {
-       { "resourceID", EXTENSION_ROOT, NOT_OPTIONAL,
+       { "resourceID", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_resourceID },
-       { "bitRate", EXTENSION_ROOT, NOT_OPTIONAL, 
+       { "bitRate", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_ATM_BitRate },
-       { "bitRateLockedToPCRClock", EXTENSION_ROOT, NOT_OPTIONAL, 
+       { "bitRateLockedToPCRClock", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_bitRateLockedToPCRClock },
-       { "bitRateLockedToNetworkClock", EXTENSION_ROOT, NOT_OPTIONAL, 
+       { "bitRateLockedToNetworkClock", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_bitRateLockedToNetworkClock },
-       { "aal", EXTENSION_ROOT, NOT_OPTIONAL, 
+       { "aal", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_NewATMVCIndication_aal },
-       { "multiplex", EXTENSION_ROOT, NOT_OPTIONAL, 
+       { "multiplex", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_NewATMVCIndication_multiplex },
-       { "reverseParameters", NOT_EXTENSION_ROOT, NOT_OPTIONAL,
+       { "reverseParameters", ASN1_NOT_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_NewATMVCIndication_reverseParameters },
        { NULL, 0, 0, NULL }
 };
@@ -10414,7 +10441,7 @@ dissect_h245_NewATMVCIndication(tvbuff_t *tvb, int offset, packet_info *pinfo, p
 static int
 dissect_h245_subChannelID(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree)
 {
-       offset=dissect_per_constrained_integer(tvb, offset, pinfo, 
+       offset=dissect_per_constrained_integer(tvb, offset, pinfo,
                tree, hf_h245_subChannelID, 0, 8191,
                NULL, NULL, FALSE);
 
@@ -10427,7 +10454,7 @@ dissect_h245_subChannelID(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_t
 static int
 dissect_h245_pcr_pid(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree)
 {
-       offset=dissect_per_constrained_integer(tvb, offset, pinfo, 
+       offset=dissect_per_constrained_integer(tvb, offset, pinfo,
                tree, hf_h245_pcr_pid, 0, 8191,
                NULL, NULL, FALSE);
 
@@ -10440,7 +10467,7 @@ dissect_h245_pcr_pid(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *
 static int
 dissect_h245_controlFieldOctets(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree)
 {
-       offset=dissect_per_constrained_integer(tvb, offset, pinfo, 
+       offset=dissect_per_constrained_integer(tvb, offset, pinfo,
                tree, hf_h245_controlFieldOctets, 0, 2,
                NULL, NULL, FALSE);
 
@@ -10453,7 +10480,7 @@ dissect_h245_controlFieldOctets(tvbuff_t *tvb, int offset, packet_info *pinfo, p
 static int
 dissect_h245_sendBufferSize(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree)
 {
-       offset=dissect_per_constrained_integer(tvb, offset, pinfo, 
+       offset=dissect_per_constrained_integer(tvb, offset, pinfo,
                tree, hf_h245_sendBufferSize, 0, 16777215,
                NULL, NULL, FALSE);
 
@@ -10464,9 +10491,9 @@ dissect_h245_sendBufferSize(tvbuff_t *tvb, int offset, packet_info *pinfo, proto
 
 
 static per_sequence_t H223LogicalChannelParameters_adaptionLayerType_al3_sequence[] = {
-       { "controlFieldOctets", NO_EXTENSIONS, NOT_OPTIONAL,
+       { "controlFieldOctets", ASN1_NO_EXTENSIONS, ASN1_NOT_OPTIONAL,
                dissect_h245_controlFieldOctets },
-       { "sendBufferSize", NO_EXTENSIONS, NOT_OPTIONAL,
+       { "sendBufferSize", ASN1_NO_EXTENSIONS, ASN1_NOT_OPTIONAL,
                dissect_h245_sendBufferSize },
        { NULL, 0, 0, NULL }
 };
@@ -10481,9 +10508,9 @@ dissect_h245_H223LogicalChannelParameters_adaptionLayerType_al3(tvbuff_t *tvb, i
 
 
 static per_sequence_t H223ModeParameters_adaptationLayerType_al3_sequence[] = {
-       { "controlFieldOctets", NO_EXTENSIONS, NOT_OPTIONAL,
+       { "controlFieldOctets", ASN1_NO_EXTENSIONS, ASN1_NOT_OPTIONAL,
                dissect_h245_controlFieldOctets },
-       { "sendBufferSize", NO_EXTENSIONS, NOT_OPTIONAL,
+       { "sendBufferSize", ASN1_NO_EXTENSIONS, ASN1_NOT_OPTIONAL,
                dissect_h245_sendBufferSize },
        { NULL, 0, 0, NULL }
 };
@@ -10501,7 +10528,7 @@ dissect_h245_H223ModeParameters_adaptationLayerType_al3(tvbuff_t *tvb, int offse
 static int
 dissect_h245_rcpcCodeRate(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree)
 {
-       offset=dissect_per_constrained_integer(tvb, offset, pinfo, 
+       offset=dissect_per_constrained_integer(tvb, offset, pinfo,
                tree, hf_h245_rcpcCodeRate, 8, 32,
                NULL, NULL, FALSE);
 
@@ -10514,7 +10541,7 @@ dissect_h245_rcpcCodeRate(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_t
 static int
 dissect_h245_rsCodeCorrection(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree)
 {
-       offset=dissect_per_constrained_integer(tvb, offset, pinfo, 
+       offset=dissect_per_constrained_integer(tvb, offset, pinfo,
                tree, hf_h245_rsCodeCorrection, 0, 127,
                NULL, NULL, FALSE);
 
@@ -10527,7 +10554,7 @@ dissect_h245_rsCodeCorrection(tvbuff_t *tvb, int offset, packet_info *pinfo, pro
 static int
 dissect_h245_finite_0_16(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree)
 {
-       offset=dissect_per_constrained_integer(tvb, offset, pinfo, 
+       offset=dissect_per_constrained_integer(tvb, offset, pinfo,
                tree, hf_h245_finite_0_16, 0, 16,
                NULL, NULL, FALSE);
 
@@ -10544,9 +10571,9 @@ static const value_string H223AnnexCArqParameters_numberOfRetransmissions_vals[]
        {  0, NULL }
 };
 static per_choice_t H223AnnexCArqParameters_numberOfRetransmissions_choice[] = {
-       {  0, "finite", EXTENSION_ROOT,
+       {  0, "finite", ASN1_EXTENSION_ROOT,
                        dissect_h245_finite_0_16 },
-       {  1, "infinite", EXTENSION_ROOT, 
+       {  1, "infinite", ASN1_EXTENSION_ROOT,
                        dissect_h245_NULL },
        {  0, NULL, 0, NULL }
 };
@@ -10562,9 +10589,9 @@ dissect_h245_H223AnnexCArqParameters_numberOfRetransmissions(tvbuff_t *tvb, int
 
 
 static per_sequence_t H223AnnexCArqParameters_sequence[] = {
-       { "numberOfRetransmissions", EXTENSION_ROOT, NOT_OPTIONAL,
+       { "numberOfRetransmissions", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_H223AnnexCArqParameters_numberOfRetransmissions },
-       { "sendBufferSize", EXTENSION_ROOT, NOT_OPTIONAL,
+       { "sendBufferSize", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_sendBufferSize },
        { NULL, 0, 0, NULL }
 };
@@ -10587,11 +10614,11 @@ static const value_string H223AL1MParameters_arqType_vals[] = {
        {  0, NULL }
 };
 static per_choice_t H223AL1MParameters_arqType_choice[] = {
-       {  0, "noArq", EXTENSION_ROOT, 
+       {  0, "noArq", ASN1_EXTENSION_ROOT,
                        dissect_h245_NULL },
-       {  1, "typeIArq", EXTENSION_ROOT, 
+       {  1, "typeIArq", ASN1_EXTENSION_ROOT,
                        dissect_h245_H223AnnexCArqParameters },
-       {  2, "typeIIArq", EXTENSION_ROOT, 
+       {  2, "typeIIArq", ASN1_EXTENSION_ROOT,
                        dissect_h245_H223AnnexCArqParameters },
        {  0, NULL, 0, NULL }
 };
@@ -10613,11 +10640,11 @@ static const value_string H223AL3MParameters_arqType_vals[] = {
        {  0, NULL }
 };
 static per_choice_t H223AL3MParameters_arqType_choice[] = {
-       {  0, "noArq", EXTENSION_ROOT, 
+       {  0, "noArq", ASN1_EXTENSION_ROOT,
                        dissect_h245_NULL },
-       {  1, "typeIArq", EXTENSION_ROOT,
+       {  1, "typeIArq", ASN1_EXTENSION_ROOT,
                        dissect_h245_H223AnnexCArqParameters },
-       {  2, "typeIIArq", EXTENSION_ROOT,
+       {  2, "typeIIArq", ASN1_EXTENSION_ROOT,
                        dissect_h245_H223AnnexCArqParameters },
        {  0, NULL, 0, NULL }
 };
@@ -10634,21 +10661,21 @@ dissect_h245_H223AL3MParameters_arqType(tvbuff_t *tvb, int offset, packet_info *
 
 
 static per_sequence_t H223AL1MParameters_sequence[] = {
-       { "transferMode", EXTENSION_ROOT, NOT_OPTIONAL, 
+       { "transferMode", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_H223AL1MParameters_transferMode },
-       { "headerFEC", EXTENSION_ROOT, NOT_OPTIONAL, 
+       { "headerFEC", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_H223AL1MParameters_headerFEC },
-       { "crcLength", EXTENSION_ROOT, NOT_OPTIONAL, 
+       { "crcLength", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_H223AL1MParameters_crcLength },
-       { "rcpcCodeRate", EXTENSION_ROOT, NOT_OPTIONAL,
+       { "rcpcCodeRate", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_rcpcCodeRate },
-       { "arqType", EXTENSION_ROOT, NOT_OPTIONAL,
+       { "arqType", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_H223AL1MParameters_arqType },
-       { "alpduInterleaving", EXTENSION_ROOT, NOT_OPTIONAL, 
+       { "alpduInterleaving", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_alpduInterleaving },
-       { "alsduSplitting", EXTENSION_ROOT, NOT_OPTIONAL, 
+       { "alsduSplitting", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_alsduSplitting },
-       { "rsCodeCorrection", NOT_EXTENSION_ROOT, OPTIONAL,
+       { "rsCodeCorrection", ASN1_NOT_EXTENSION_ROOT, ASN1_OPTIONAL,
                dissect_h245_rsCodeCorrection },
        { NULL, 0, 0, NULL }
 };
@@ -10664,17 +10691,17 @@ dissect_h245_H223AL1MParameters(tvbuff_t *tvb, int offset, packet_info *pinfo, p
 
 
 static per_sequence_t H223AL3MParameters_sequence[] = {
-       { "headerFormat", EXTENSION_ROOT, NOT_OPTIONAL, 
+       { "headerFormat", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_H223AL3MParameters_headerFormat },
-       { "crcLength", EXTENSION_ROOT, NOT_OPTIONAL, 
+       { "crcLength", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_H223AL3MParameters_crcLength },
-       { "rcpcCodeRate", EXTENSION_ROOT, NOT_OPTIONAL,
+       { "rcpcCodeRate", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_rcpcCodeRate },
-       { "arqType", EXTENSION_ROOT, NOT_OPTIONAL,
+       { "arqType", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_H223AL3MParameters_arqType },
-       { "alpduInterleaving", EXTENSION_ROOT, NOT_OPTIONAL, 
+       { "alpduInterleaving", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_alpduInterleaving },
-       { "rsCodeCorrection", NOT_EXTENSION_ROOT, OPTIONAL,
+       { "rsCodeCorrection", ASN1_NOT_EXTENSION_ROOT, ASN1_OPTIONAL,
                dissect_h245_rsCodeCorrection },
        { NULL, 0, 0, NULL }
 };
@@ -10693,7 +10720,7 @@ dissect_h245_H223AL3MParameters(tvbuff_t *tvb, int offset, packet_info *pinfo, p
 static int
 dissect_h245_windowSize(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree)
 {
-       offset=dissect_per_constrained_integer(tvb, offset, pinfo, 
+       offset=dissect_per_constrained_integer(tvb, offset, pinfo,
                tree, hf_h245_windowSize, 1, 127,
                NULL, NULL, FALSE);
 
@@ -10704,9 +10731,9 @@ dissect_h245_windowSize(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tre
 
 
 static per_sequence_t V76LogicalChannelParameters_mode_eRM_sequence[] = {
-       { "windowSize", EXTENSION_ROOT, NOT_OPTIONAL,
+       { "windowSize", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_windowSize },
-       { "recovery", EXTENSION_ROOT, NOT_OPTIONAL, 
+       { "recovery", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_V76LogicalChannelParameters_mode_eRM_recovery },
        { NULL, 0, 0, NULL }
 };
@@ -10726,9 +10753,9 @@ static const value_string V76LogicalChannelParameters_mode_vals[] = {
        {  0, NULL }
 };
 static per_choice_t V76LogicalChannelParameters_mode_choice[] = {
-       {  0, "eRM", EXTENSION_ROOT, 
+       {  0, "eRM", ASN1_EXTENSION_ROOT,
                        dissect_h245_V76LogicalChannelParameters_mode_eRM },
-       {  1, "uNERM", EXTENSION_ROOT, 
+       {  1, "uNERM", ASN1_EXTENSION_ROOT,
                        dissect_h245_NULL },
        {  0, NULL, 0, NULL }
 };
@@ -10746,7 +10773,7 @@ dissect_h245_V76LogicalChannelParameters_mode(tvbuff_t *tvb, int offset, packet_
 static int
 dissect_h245_n401(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree)
 {
-       offset=dissect_per_constrained_integer(tvb, offset, pinfo, 
+       offset=dissect_per_constrained_integer(tvb, offset, pinfo,
                tree, hf_h245_n401, 1, 4095,
                NULL, NULL, FALSE);
 
@@ -10758,11 +10785,11 @@ dissect_h245_n401(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tre
 
 
 static per_sequence_t V76HDLCParameters_sequence[] = {
-       { "crcLength", EXTENSION_ROOT, NOT_OPTIONAL, 
+       { "crcLength", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_CRCLength },
-       { "n401", EXTENSION_ROOT, NOT_OPTIONAL,
+       { "n401", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_n401 },
-       { "loopbackTestProcedure", EXTENSION_ROOT, NOT_OPTIONAL, 
+       { "loopbackTestProcedure", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_loopbackTestProcedure },
        { NULL, 0, 0, NULL }
 };
@@ -10778,15 +10805,15 @@ dissect_h245_V76HDLCParameters(tvbuff_t *tvb, int offset, packet_info *pinfo, pr
 
 
 static per_sequence_t V76LogicalChannelParameters_sequence[] = {
-       { "hdlcParameters", EXTENSION_ROOT, NOT_OPTIONAL,
+       { "hdlcParameters", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_V76HDLCParameters },
-       { "suspendResume", EXTENSION_ROOT, NOT_OPTIONAL, 
+       { "suspendResume", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_V76LogicalChannelParameters_suspendResume },
-       { "uIH", EXTENSION_ROOT, NOT_OPTIONAL, 
+       { "uIH", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_uIH },
-       { "mode", EXTENSION_ROOT, NOT_OPTIONAL,
+       { "mode", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_V76LogicalChannelParameters_mode },
-       { "v75Parameters", EXTENSION_ROOT, NOT_OPTIONAL, 
+       { "v75Parameters", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_V75Parameters },
        { NULL, 0, 0, NULL }
 };
@@ -10803,7 +10830,7 @@ dissect_h245_V76LogicalChannelParameters(tvbuff_t *tvb, int offset, packet_info
 static int
 dissect_h245_sessionID_0_255(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree)
 {
-       offset=dissect_per_constrained_integer(tvb, offset, pinfo, 
+       offset=dissect_per_constrained_integer(tvb, offset, pinfo,
                tree, hf_h245_sessionID_0_255, 0, 255,
                NULL, NULL, FALSE);
 
@@ -10815,7 +10842,7 @@ dissect_h245_sessionID_0_255(tvbuff_t *tvb, int offset, packet_info *pinfo, prot
 static int
 dissect_h245_sessionID_1_255(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree)
 {
-       offset=dissect_per_constrained_integer(tvb, offset, pinfo, 
+       offset=dissect_per_constrained_integer(tvb, offset, pinfo,
                tree, hf_h245_sessionID_1_255, 1, 255,
                NULL, NULL, FALSE);
 
@@ -10828,7 +10855,7 @@ dissect_h245_sessionID_1_255(tvbuff_t *tvb, int offset, packet_info *pinfo, prot
 static int
 dissect_h245_associatedSessionID(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree)
 {
-       offset=dissect_per_constrained_integer(tvb, offset, pinfo, 
+       offset=dissect_per_constrained_integer(tvb, offset, pinfo,
                tree, hf_h245_associatedSessionID, 1, 255,
                NULL, NULL, FALSE);
 
@@ -10877,9 +10904,9 @@ dissect_h245_protectedPayloadType(tvbuff_t *tvb, int offset, packet_info *pinfo,
 
 
 static per_sequence_t FECData_rfc2733_mode_separateStream_differentPort_sequence[] = {
-       { "protectedSessionID", EXTENSION_ROOT, NOT_OPTIONAL,
+       { "protectedSessionID", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_protectedSessionID },
-       { "protectedPayloadType", EXTENSION_ROOT, OPTIONAL,
+       { "protectedPayloadType", ASN1_EXTENSION_ROOT, ASN1_OPTIONAL,
                dissect_h245_protectedPayloadType },
        { NULL, 0, 0, NULL }
 };
@@ -10895,7 +10922,7 @@ dissect_h245_FECData_rfc2733_mode_separateStream_differentPort(tvbuff_t *tvb, in
 
 
 static per_sequence_t FECData_rfc2733_mode_separateStream_samePort_sequence[] = {
-       { "protectedPayloadType", EXTENSION_ROOT, NOT_OPTIONAL, 
+       { "protectedPayloadType", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_protectedPayloadType },
        { NULL, 0, 0, NULL }
 };
@@ -10915,9 +10942,9 @@ static const value_string FECData_rfc2733_mode_separateStream_vals[] = {
        {  0, NULL }
 };
 static per_choice_t FECData_rfc2733_mode_separateStream_choice[] = {
-       {  0, "differentPort", EXTENSION_ROOT, 
+       {  0, "differentPort", ASN1_EXTENSION_ROOT,
                dissect_h245_FECData_rfc2733_mode_separateStream_differentPort },
-       {  1, "samePort", EXTENSION_ROOT,
+       {  1, "samePort", ASN1_EXTENSION_ROOT,
                dissect_h245_FECData_rfc2733_mode_separateStream_samePort },
        {  0, NULL, 0, NULL }
 };
@@ -10938,9 +10965,9 @@ static const value_string FECData_rfc2733_mode_vals[] = {
        {  0, NULL }
 };
 static per_choice_t FECData_rfc2733_mode_choice[] = {
-       {  0, "redundancyEncoding", EXTENSION_ROOT, 
+       {  0, "redundancyEncoding", ASN1_EXTENSION_ROOT,
                        dissect_h245_NULL },
-       {  1, "separateStream", EXTENSION_ROOT,
+       {  1, "separateStream", ASN1_EXTENSION_ROOT,
                        dissect_h245_FECData_rfc2733_mode_separateStream },
        {  0, NULL, 0, NULL }
 };
@@ -10956,7 +10983,7 @@ dissect_h245_FECData_rfc2733_mode(tvbuff_t *tvb, int offset, packet_info *pinfo,
 
 
 static per_sequence_t FECData_rfc2733_sequence[] = {
-       { "mode", EXTENSION_ROOT, NOT_OPTIONAL, 
+       { "mode", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_FECData_rfc2733_mode },
        { NULL, 0, 0, NULL }
 };
@@ -10976,7 +11003,7 @@ static const value_string FECData_vals[] = {
        {  0, NULL }
 };
 static per_choice_t FECData_choice[] = {
-       {  0, "rfc2733", NO_EXTENSIONS,
+       {  0, "rfc2733", ASN1_NO_EXTENSIONS,
                dissect_h245_FECData_rfc2733 },
        {  0, NULL, 0, NULL }
 };
@@ -10992,9 +11019,9 @@ dissect_h245_FECData(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *
 
 
 static per_sequence_t FECMode_rfc2733Mode_mode_separateStream_differentPort_sequence[] = {
-       { "protectedSessionID", EXTENSION_ROOT, NOT_OPTIONAL, 
+       { "protectedSessionID", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_protectedSessionID },
-       { "protectedPayloadType", EXTENSION_ROOT, OPTIONAL,
+       { "protectedPayloadType", ASN1_EXTENSION_ROOT, ASN1_OPTIONAL,
                dissect_h245_protectedPayloadType },
        { NULL, 0, 0, NULL }
 };
@@ -11014,7 +11041,7 @@ dissect_h245_tsapIdentifier(tvbuff_t *tvb, int offset, packet_info *pinfo, proto
 {
        offset=dissect_per_constrained_integer(tvb, offset, pinfo, tree,
                hf_h245_tsapIdentifier,  0,  65535,
-               NULL, NULL, FALSE);
+               &ipv4_port, NULL, FALSE);
 
        return offset;
 }
@@ -11053,9 +11080,9 @@ static const value_string MultiplexElement_repeatCount_vals[] = {
        {  0, NULL }
 };
 static per_choice_t MultiplexElement_repeatCount_choice[] = {
-       {  0, "finite", NO_EXTENSIONS,
+       {  0, "finite", ASN1_NO_EXTENSIONS,
                        dissect_h245_finite_1_65535 },
-       {  1, "untilClosingFlag", NO_EXTENSIONS, 
+       {  1, "untilClosingFlag", ASN1_NO_EXTENSIONS,
                        dissect_h245_NULL },
        {  0, NULL, 0, NULL }
 };
@@ -11084,9 +11111,9 @@ dissect_h245_MultiplexTableEntryNumber(tvbuff_t *tvb, int offset, packet_info *p
 
 
 static per_sequence_t MultiplexEntryRejectionDescriptions_sequence[] = {
-       { "multiplexTableEntryNumber", EXTENSION_ROOT, NOT_OPTIONAL,
+       { "multiplexTableEntryNumber", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_MultiplexTableEntryNumber },
-       { "cause", EXTENSION_ROOT, NOT_OPTIONAL, 
+       { "cause", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_MultiplexEntryRejectionDescriptions_cause },
        { NULL, 0, 0, NULL }
 };
@@ -11102,9 +11129,9 @@ dissect_h245_MultiplexEntryRejectionDescriptions(tvbuff_t *tvb, int offset, pack
 
 
 static per_sequence_t RequestMultiplexEntryRejectionDescriptions_sequence[] = {
-       { "multiplexTableEntryNumber", EXTENSION_ROOT, NOT_OPTIONAL,
+       { "multiplexTableEntryNumber", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_MultiplexTableEntryNumber },
-       { "cause", EXTENSION_ROOT, NOT_OPTIONAL, 
+       { "cause", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_RequestMultiplexEntryRejectionDescriptions_cause},
        { NULL, 0, 0, NULL }
 };
@@ -11182,9 +11209,9 @@ dissect_h245_TerminalNumber(tvbuff_t *tvb, int offset, packet_info *pinfo, proto
 
 
 static per_sequence_t TerminalLabel_sequence[] = {
-       { "mcuNumber", EXTENSION_ROOT, NOT_OPTIONAL,
+       { "mcuNumber", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_McuNumber },
-       { "terminalNumber", EXTENSION_ROOT, NOT_OPTIONAL,
+       { "terminalNumber", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_TerminalNumber },
        { NULL, 0, 0, NULL }
 };
@@ -11214,7 +11241,7 @@ dissect_h245_maxNumberOfAdditionalConnections(tvbuff_t *tvb, int offset, packet_
 
 
 static per_sequence_t MultilinkRequest_callInformation_sequence[] = {
-       { "maxNumberOfAdditionalConnections", EXTENSION_ROOT, NOT_OPTIONAL,
+       { "maxNumberOfAdditionalConnections", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_maxNumberOfAdditionalConnections },
        { NULL, 0, 0, NULL }
 };
@@ -11249,9 +11276,9 @@ static const value_string MultilinkRequest_maximumHeaderInterval_requestType_val
        {  0, NULL }
 };
 static per_choice_t MultilinkRequest_maximumHeaderInterval_requestType_choice[] = {
-       {  0, "currentIntervalInformation", EXTENSION_ROOT, 
+       {  0, "currentIntervalInformation", ASN1_EXTENSION_ROOT,
                        dissect_h245_NULL },
-       {  1, "requestedInterval", EXTENSION_ROOT,
+       {  1, "requestedInterval", ASN1_EXTENSION_ROOT,
                        dissect_h245_requestedInterval },
        {  0, NULL, 0, NULL }
 };
@@ -11267,7 +11294,7 @@ dissect_h245_MultilinkRequest_maximumHeaderInterval_requestType(tvbuff_t *tvb, i
 
 
 static per_sequence_t MultilinkRequest_maximumHeaderInterval_sequence[] = {
-       { "requestType", EXTENSION_ROOT, NOT_OPTIONAL,
+       { "requestType", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_MultilinkRequest_maximumHeaderInterval_requestType },
        { NULL, 0, 0, NULL }
 };
@@ -11308,7 +11335,7 @@ dissect_h245_currentInterval(tvbuff_t *tvb, int offset, packet_info *pinfo, prot
 
 
 static per_sequence_t MultilinkResponse_maximumHeaderInterval_sequence[] = {
-       { "currentInterval", EXTENSION_ROOT, NOT_OPTIONAL,
+       { "currentInterval", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_currentInterval },
        { NULL, 0, 0, NULL }
 };
@@ -11364,9 +11391,9 @@ dissect_h245_ConnectionIDsequenceNumber(tvbuff_t *tvb, int offset, packet_info *
 
 
 static per_sequence_t ConnectionIdentifier_sequence[] = {
-       { "channelTag", EXTENSION_ROOT, NOT_OPTIONAL,
+       { "channelTag", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_channelTag },
-       { "sequenceNumber", EXTENSION_ROOT, NOT_OPTIONAL,
+       { "sequenceNumber", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_ConnectionIDsequenceNumber },
        { NULL, 0, 0, NULL }
 };
@@ -11382,7 +11409,7 @@ dissect_h245_ConnectionIdentifier(tvbuff_t *tvb, int offset, packet_info *pinfo,
 
 
 static per_sequence_t MultilinkRequest_removeConnection_sequence[] = {
-       { "connectionIdentifier", EXTENSION_ROOT, NOT_OPTIONAL,
+       { "connectionIdentifier", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_ConnectionIdentifier },
        { NULL, 0, 0, NULL }
 };
@@ -11398,7 +11425,7 @@ dissect_h245_MultilinkRequest_removeConnection(tvbuff_t *tvb, int offset, packet
 
 
 static per_sequence_t MultilinkResponse_removeConnection_sequence[] = {
-       { "connectionIdentifier", EXTENSION_ROOT, NOT_OPTIONAL,
+       { "connectionIdentifier", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_ConnectionIdentifier },
        { NULL, 0, 0, NULL }
 };
@@ -11414,7 +11441,7 @@ dissect_h245_MultilinkResponse_removeConnection(tvbuff_t *tvb, int offset, packe
 
 
 static per_sequence_t MultilinkIndication_excessiveError_sequence[] = {
-       { "connectionIdentifier", EXTENSION_ROOT, NOT_OPTIONAL,
+       { "connectionIdentifier", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_ConnectionIdentifier },
        { NULL, 0, 0, NULL }
 };
@@ -11442,11 +11469,11 @@ dissect_h245_MaximumBitRate(tvbuff_t *tvb, int offset, packet_info *pinfo, proto
 
 
 static per_sequence_t LogicalChannelRateRequest_sequence[] = {
-       { "sequenceNumber", EXTENSION_ROOT, NOT_OPTIONAL, 
+       { "sequenceNumber", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_SequenceNumber },
-       { "logicalChannelNumber", EXTENSION_ROOT, NOT_OPTIONAL, 
+       { "logicalChannelNumber", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_LogicalChannelNumber },
-       { "maximumBitRate", EXTENSION_ROOT, NOT_OPTIONAL,
+       { "maximumBitRate", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_MaximumBitRate },
        { NULL, 0, 0, NULL }
 };
@@ -11461,11 +11488,11 @@ dissect_h245_LogicalChannelRateRequest(tvbuff_t *tvb, int offset, packet_info *p
 
 
 static per_sequence_t LogicalChannelRateAck_sequence[] = {
-       { "sequenceNumber", EXTENSION_ROOT, NOT_OPTIONAL, 
+       { "sequenceNumber", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_SequenceNumber },
-       { "logicalChannelNumber", EXTENSION_ROOT, NOT_OPTIONAL, 
+       { "logicalChannelNumber", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_LogicalChannelNumber },
-       { "maximumBitRate", EXTENSION_ROOT, NOT_OPTIONAL,
+       { "maximumBitRate", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_MaximumBitRate },
        { NULL, 0, 0, NULL }
 };
@@ -11481,13 +11508,13 @@ dissect_h245_LogicalChannelRateAck(tvbuff_t *tvb, int offset, packet_info *pinfo
 
 
 static per_sequence_t LogicalChannelRateReject_sequence[] = {
-       { "sequenceNumber", EXTENSION_ROOT, NOT_OPTIONAL, 
+       { "sequenceNumber", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                        dissect_h245_SequenceNumber },
-       { "logicalChannelNumber", EXTENSION_ROOT, NOT_OPTIONAL, 
+       { "logicalChannelNumber", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                        dissect_h245_LogicalChannelNumber },
-       { "rejectReason", EXTENSION_ROOT, NOT_OPTIONAL, 
+       { "rejectReason", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                        dissect_h245_LogicalChannelRateRejectReason },
-       { "currentMaximumBitRate", EXTENSION_ROOT, OPTIONAL,
+       { "currentMaximumBitRate", ASN1_EXTENSION_ROOT, ASN1_OPTIONAL,
                        dissect_h245_MaximumBitRate },
        { NULL, 0, 0, NULL }
 };
@@ -11535,9 +11562,9 @@ static const value_string FlowControlCommand_restriction_vals[] = {
        {  0, NULL }
 };
 static per_choice_t FlowControlCommand_restriction_choice[] = {
-       {  0, "maximumBitRate", NO_EXTENSIONS,
+       {  0, "maximumBitRate", ASN1_NO_EXTENSIONS,
                        dissect_h245_maximumBitRate_0_16777215 },
-       {  1, "noRestriction", NO_EXTENSIONS, 
+       {  1, "noRestriction", ASN1_NO_EXTENSIONS,
                        dissect_h245_NULL },
        {  0, NULL, 0, NULL }
 };
@@ -11558,9 +11585,9 @@ static const value_string FlowControlIndication_restriction_vals[] = {
        {  0, NULL }
 };
 static per_choice_t FlowControlIndication_restriction_choice[] = {
-       {  0, "maximumBitRate", NO_EXTENSIONS,
+       {  0, "maximumBitRate", ASN1_NO_EXTENSIONS,
                        dissect_h245_maximumBitRate_0_16777215 },
-       {  1, "noRestrictions", NO_EXTENSIONS, 
+       {  1, "noRestrictions", ASN1_NO_EXTENSIONS,
                        dissect_h245_NULL },
        {  0, NULL, 0, NULL }
 };
@@ -11576,9 +11603,9 @@ dissect_h245_FlowControlIndication_restriction(tvbuff_t *tvb, int offset, packet
 
 
 static per_sequence_t FlowControlCommand_sequence[] = {
-       { "scope", EXTENSION_ROOT, NOT_OPTIONAL,
+       { "scope", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_FlowControlCommand_scope },
-       { "restriction", EXTENSION_ROOT, NOT_OPTIONAL,
+       { "restriction", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_FlowControlCommand_restriction },
        { NULL, 0, 0, NULL }
 };
@@ -11593,9 +11620,9 @@ dissect_h245_FlowControlCommand(tvbuff_t *tvb, int offset, packet_info *pinfo, p
 
 
 static per_sequence_t FlowControlIndication_sequence[] = {
-       { "scope", EXTENSION_ROOT, NOT_OPTIONAL,
+       { "scope", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_FlowControlIndication_scope },
-       { "restriction", EXTENSION_ROOT, NOT_OPTIONAL,
+       { "restriction", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_FlowControlIndication_restriction },
        { NULL, 0, 0, NULL }
 };
@@ -11636,9 +11663,9 @@ dissect_h245_numberOfGOBs(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_t
 
 
 static per_sequence_t MiscellaneousCommand_type_videoFastUpdateGOB_sequence[] = {
-       { "firstGOB", NO_EXTENSIONS, NOT_OPTIONAL,
+       { "firstGOB", ASN1_NO_EXTENSIONS, ASN1_NOT_OPTIONAL,
                dissect_h245_firstGOB_0_17 },
-       { "numberOfGOBs", NO_EXTENSIONS, NOT_OPTIONAL,
+       { "numberOfGOBs", ASN1_NO_EXTENSIONS, ASN1_NOT_OPTIONAL,
                dissect_h245_numberOfGOBs },
        { NULL, 0, 0, NULL }
 };
@@ -11729,11 +11756,11 @@ dissect_h245_numberOfMBs_1_9216(tvbuff_t *tvb, int offset, packet_info *pinfo, p
 
 
 static per_sequence_t MiscellaneousCommand_type_videoFastUpdateMB_sequence[] = {
-       { "firstGOB", EXTENSION_ROOT, OPTIONAL,
+       { "firstGOB", ASN1_EXTENSION_ROOT, ASN1_OPTIONAL,
                dissect_h245_firstGOB_0_255 },
-       { "firstMB", EXTENSION_ROOT, OPTIONAL,
+       { "firstMB", ASN1_EXTENSION_ROOT, ASN1_OPTIONAL,
                dissect_h245_firstMB_1_8192 },
-       { "numberOfMBs", EXTENSION_ROOT, NOT_OPTIONAL,
+       { "numberOfMBs", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_numberOfMBs_1_8192 },
        { NULL, 0, 0, NULL }
 };
@@ -11790,11 +11817,11 @@ dissect_h245_temporalReference_0_255(tvbuff_t *tvb, int offset, packet_info *pin
 
 
 static per_sequence_t MiscellaneousIndication_type_videoNotDecodedMBs_sequence[] = {
-       { "firstMB", EXTENSION_ROOT, NOT_OPTIONAL,
+       { "firstMB", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_firstMB_1_8192 },
-       { "numberOfMBs", EXTENSION_ROOT, NOT_OPTIONAL,
+       { "numberOfMBs", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_numberOfMBs_1_8192 },
-       { "temporalReference", EXTENSION_ROOT, NOT_OPTIONAL,
+       { "temporalReference", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_temporalReference_0_255 },
        { NULL, 0, 0, NULL }
 };
@@ -11811,11 +11838,11 @@ dissect_h245_MiscellaneousIndication_type_videoNotDecodedMBs(tvbuff_t *tvb, int
 
 
 static per_sequence_t MiscellaneousCommand_type_videoBadMBs_sequence[] = {
-       { "firstMB", EXTENSION_ROOT, NOT_OPTIONAL,
+       { "firstMB", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_firstMB_1_9216 },
-       { "numberOfMBs", EXTENSION_ROOT, NOT_OPTIONAL,
+       { "numberOfMBs", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_numberOfMBs_1_9216 },
-       { "temporalReference", EXTENSION_ROOT, NOT_OPTIONAL,
+       { "temporalReference", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_temporalReference_0_1023 },
        { NULL, 0, 0, NULL }
 };
@@ -11862,9 +11889,9 @@ static const value_string PictureReference_vals[] = {
        {  0, NULL }
 };
 static per_choice_t PictureReference_choice[] = {
-       {  0, "pictureNumber", EXTENSION_ROOT,
+       {  0, "pictureNumber", ASN1_EXTENSION_ROOT,
                dissect_h245_pictureNumber },
-       {  1, "longTermPictureIndex", EXTENSION_ROOT,
+       {  1, "longTermPictureIndex", ASN1_EXTENSION_ROOT,
                dissect_h245_longTermPictureIndex },
        {  0, NULL, 0, NULL }
 };
@@ -11880,11 +11907,11 @@ dissect_h245_PictureReference(tvbuff_t *tvb, int offset, packet_info *pinfo, pro
 
 
 static per_sequence_t MiscellaneousCommand_type_lostPartialPicture_sequence[] = {
-       { "pictureReference", EXTENSION_ROOT, NOT_OPTIONAL,
+       { "pictureReference", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_PictureReference },
-       { "firstMB", EXTENSION_ROOT, NOT_OPTIONAL,
+       { "firstMB", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_firstMB_1_9216 },
-       { "numberOfMBs", EXTENSION_ROOT, NOT_OPTIONAL,
+       { "numberOfMBs", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_numberOfMBs_1_9216 },
        { NULL, 0, 0, NULL }
 };
@@ -11924,9 +11951,9 @@ dissect_h245_samplesPerFrame(tvbuff_t *tvb, int offset, packet_info *pinfo, prot
 
 
 static per_sequence_t MobileMultilinkReconfigurationIndication_sequence[] = {
-       { "sampleSize", EXTENSION_ROOT, NOT_OPTIONAL,
+       { "sampleSize", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_sampleSize },
-       { "samplesPerFrame", EXTENSION_ROOT, NOT_OPTIONAL,
+       { "samplesPerFrame", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_samplesPerFrame },
        { NULL, 0, 0, NULL }
 };
@@ -11942,11 +11969,11 @@ dissect_h245_MobileMultilinkReconfigurationIndication(tvbuff_t *tvb, int offset,
 
 
 static per_sequence_t MobileMultilinkReconfigurationCommand_sequence[] = {
-       { "sampleSize", EXTENSION_ROOT, NOT_OPTIONAL,
+       { "sampleSize", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_sampleSize },
-       { "samplesPerFrame", EXTENSION_ROOT, NOT_OPTIONAL,
+       { "samplesPerFrame", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_samplesPerFrame },
-       { "status", EXTENSION_ROOT, NOT_OPTIONAL, 
+       { "status", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_MobileMultilinkReconfigurationCommand_status },
        { NULL, 0, 0, NULL }
 };
@@ -11991,9 +12018,9 @@ dissect_h245_subPictureNumber(tvbuff_t *tvb, int offset, packet_info *pinfo, pro
 
 
 static per_sequence_t TerminalYouAreSeeingInSubPictureNumber_sequence[] = {
-       { "terminalNumber", EXTENSION_ROOT, NOT_OPTIONAL,
+       { "terminalNumber", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_TerminalNumber },
-       { "subPictureNumber", EXTENSION_ROOT, NOT_OPTIONAL,
+       { "subPictureNumber", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_subPictureNumber },
        { NULL, 0, 0, NULL }
 };
@@ -12021,7 +12048,7 @@ dissect_h245_compositionNumber(tvbuff_t *tvb, int offset, packet_info *pinfo, pr
 
 
 static per_sequence_t VideoIndicateCompose_sequence[] = {
-       { "compositionNumber", EXTENSION_ROOT, NOT_OPTIONAL,
+       { "compositionNumber", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_compositionNumber },
        { NULL, 0, 0, NULL }
 };
@@ -12054,33 +12081,33 @@ static const value_string ConferenceIndication_vals[] = {
        {  0, NULL }
 };
 static per_choice_t ConferenceIndication_choice[] = {
-       {  0, "sbeNumber", EXTENSION_ROOT,
+       {  0, "sbeNumber", ASN1_EXTENSION_ROOT,
                        dissect_h245_sbeNumber },
-       {  1, "terminalNumberAssign", EXTENSION_ROOT,
+       {  1, "terminalNumberAssign", ASN1_EXTENSION_ROOT,
                        dissect_h245_TerminalLabel },
-       {  2, "terminalJoinedConference", EXTENSION_ROOT,
+       {  2, "terminalJoinedConference", ASN1_EXTENSION_ROOT,
                        dissect_h245_TerminalLabel },
-       {  3, "terminalLeftConference", EXTENSION_ROOT,
+       {  3, "terminalLeftConference", ASN1_EXTENSION_ROOT,
                        dissect_h245_TerminalLabel },
-       {  4, "seenByAtLeastOneOther", EXTENSION_ROOT, 
+       {  4, "seenByAtLeastOneOther", ASN1_EXTENSION_ROOT,
                        dissect_h245_NULL },
-       {  5, "cancelSeenByAtLeastOneOther", EXTENSION_ROOT, 
+       {  5, "cancelSeenByAtLeastOneOther", ASN1_EXTENSION_ROOT,
                        dissect_h245_NULL },
-       {  6, "seenByAll", EXTENSION_ROOT, 
+       {  6, "seenByAll", ASN1_EXTENSION_ROOT,
                        dissect_h245_NULL },
-       {  7, "cancelSeenByAll", EXTENSION_ROOT, 
+       {  7, "cancelSeenByAll", ASN1_EXTENSION_ROOT,
                        dissect_h245_NULL },
-       {  8, "terminalAreYouSeeing", EXTENSION_ROOT,
+       {  8, "terminalAreYouSeeing", ASN1_EXTENSION_ROOT,
                        dissect_h245_TerminalLabel },
-       {  9, "requestForFloor", EXTENSION_ROOT,
+       {  9, "requestForFloor", ASN1_EXTENSION_ROOT,
                        dissect_h245_NULL },
-       { 10, "withdrawChairToken", NOT_EXTENSION_ROOT, 
+       { 10, "withdrawChairToken", ASN1_NOT_EXTENSION_ROOT,
                        dissect_h245_NULL },
-       { 11, "floorRequested", NOT_EXTENSION_ROOT,
+       { 11, "floorRequested", ASN1_NOT_EXTENSION_ROOT,
                        dissect_h245_TerminalLabel },
-       { 12, "terminalAreYouSeeingInSubPictureNumber", NOT_EXTENSION_ROOT,
+       { 12, "terminalAreYouSeeingInSubPictureNumber", ASN1_NOT_EXTENSION_ROOT,
                        dissect_h245_TerminalYouAreSeeingInSubPictureNumber },
-       { 13, "videoIndicateCompose", NOT_EXTENSION_ROOT,
+       { 13, "videoIndicateCompose", ASN1_NOT_EXTENSION_ROOT,
                        dissect_h245_VideoIndicateCompose },
        {  0, NULL, 0, NULL }
 };
@@ -12147,15 +12174,15 @@ dissect_h245_additionalDecoderBuffer(tvbuff_t *tvb, int offset, packet_info *pin
 
 
 static per_sequence_t JitterIndication_sequence[] = {
-       { "scope", EXTENSION_ROOT, NOT_OPTIONAL,
+       { "scope", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_JitterIndication_scope },
-       { "estimatedReceivedJitterMantissa", EXTENSION_ROOT, NOT_OPTIONAL,
+       { "estimatedReceivedJitterMantissa", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_estimatedReceivedJitterMantissa },
-       { "estimatedReceivedJitterExponent", EXTENSION_ROOT, NOT_OPTIONAL,
+       { "estimatedReceivedJitterExponent", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_estimatedReceivedJitterExponent },
-       { "skippedFrameCount", EXTENSION_ROOT, OPTIONAL,
+       { "skippedFrameCount", ASN1_EXTENSION_ROOT, ASN1_OPTIONAL,
                dissect_h245_skippedFrameCount },
-       { "additionalDecoderBuffer", EXTENSION_ROOT, OPTIONAL,
+       { "additionalDecoderBuffer", ASN1_EXTENSION_ROOT, ASN1_OPTIONAL,
                dissect_h245_additionalDecoderBuffer },
        { NULL, 0, 0, NULL }
 };
@@ -12183,11 +12210,11 @@ dissect_h245_skew(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tre
 
 
 static per_sequence_t H223SkewIndication_sequence[] = {
-       { "logicalChannelNumber1", EXTENSION_ROOT, NOT_OPTIONAL, 
+       { "logicalChannelNumber1", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                        dissect_h245_LogicalChannelNumber },
-       { "logicalChannelNumber2", EXTENSION_ROOT, NOT_OPTIONAL, 
+       { "logicalChannelNumber2", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                        dissect_h245_LogicalChannelNumber },
-       { "skew", EXTENSION_ROOT, NOT_OPTIONAL,
+       { "skew", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                        dissect_h245_skew },
        { NULL, 0, 0, NULL }
 };
@@ -12216,11 +12243,11 @@ dissect_h245_maximumSkew(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tr
 
 
 static per_sequence_t H2250MaximumSkewIndication_sequence[] = {
-       { "logicalChannelNumber1", EXTENSION_ROOT, NOT_OPTIONAL, 
+       { "logicalChannelNumber1", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                        dissect_h245_LogicalChannelNumber },
-       { "logicalChannelNumber2", EXTENSION_ROOT, NOT_OPTIONAL, 
+       { "logicalChannelNumber2", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                        dissect_h245_LogicalChannelNumber },
-       { "maximumSkew", EXTENSION_ROOT, NOT_OPTIONAL,
+       { "maximumSkew", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                        dissect_h245_maximumSkew },
        { NULL, 0, 0, NULL }
 };
@@ -12248,9 +12275,9 @@ dissect_h245_duration(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree
 
 
 static per_sequence_t UserInputIndication_signalUpdate_sequence[] = {
-       { "duration", EXTENSION_ROOT, NOT_OPTIONAL,
+       { "duration", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_duration },
-       { "rtp", EXTENSION_ROOT, OPTIONAL, 
+       { "rtp", ASN1_EXTENSION_ROOT, ASN1_OPTIONAL,
                dissect_h245_UserInputIndication_signalUpdate_rtp },
        { NULL, 0, 0, NULL }
 };
@@ -12291,11 +12318,11 @@ dissect_h245_expirationTime(tvbuff_t *tvb, int offset, packet_info *pinfo, proto
 
 
 static per_sequence_t UserInputIndication_signal_rtp_sequence[] = {
-       { "timestamp", EXTENSION_ROOT, OPTIONAL,
+       { "timestamp", ASN1_EXTENSION_ROOT, ASN1_OPTIONAL,
                dissect_h245_timestamp },
-       { "expirationTime", EXTENSION_ROOT, OPTIONAL,
+       { "expirationTime", ASN1_EXTENSION_ROOT, ASN1_OPTIONAL,
                dissect_h245_expirationTime },
-       { "logicalChannelNumber", EXTENSION_ROOT, NOT_OPTIONAL, 
+       { "logicalChannelNumber", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_LogicalChannelNumber },
        { NULL, 0, 0, NULL }
 };
@@ -12313,7 +12340,7 @@ dissect_h245_UserInputIndication_signal_rtp(tvbuff_t *tvb, int offset, packet_in
 
 
 static per_sequence_t MasterSlaveDeterminationRelease_sequence[] = {
-       { NULL, EXTENSION_ROOT, 0, NULL }
+       { NULL, ASN1_EXTENSION_ROOT, 0, NULL }
 };
 static int
 dissect_h245_MasterSlaveDeterminationRelease(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree)
@@ -12328,7 +12355,7 @@ dissect_h245_MasterSlaveDeterminationRelease(tvbuff_t *tvb, int offset, packet_i
 
 
 static per_sequence_t MultilinkIndication_crcDesired_sequence[] = {
-       { NULL, EXTENSION_ROOT, 0, NULL }
+       { NULL, ASN1_EXTENSION_ROOT, 0, NULL }
 };
 static int
 dissect_h245_MultilinkIndication_crcDesired(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree)
@@ -12345,7 +12372,7 @@ dissect_h245_MultilinkIndication_crcDesired(tvbuff_t *tvb, int offset, packet_in
 static int
 dissect_h245_object(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree)
 {
-       offset=dissect_per_object_identifier(tvb, offset, pinfo, tree, hf_h245_object);
+       offset=dissect_per_object_identifier(tvb, offset, pinfo, tree, hf_h245_object, object);
        return offset;
 }
 
@@ -12354,7 +12381,7 @@ dissect_h245_object(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *t
 static int
 dissect_h245_protocolIdentifier(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree)
 {
-       offset=dissect_per_object_identifier(tvb, offset, pinfo, tree, hf_h245_protocolIdentifier);
+       offset=dissect_per_object_identifier(tvb, offset, pinfo, tree, hf_h245_protocolIdentifier, NULL);
        return offset;
 }
 
@@ -12364,7 +12391,7 @@ dissect_h245_protocolIdentifier(tvbuff_t *tvb, int offset, packet_info *pinfo, p
 static int
 dissect_h245_algorithm(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree)
 {
-       offset=dissect_per_object_identifier(tvb, offset, pinfo, tree, hf_h245_algorithm);
+       offset=dissect_per_object_identifier(tvb, offset, pinfo, tree, hf_h245_algorithm, NULL);
        return offset;
 }
 
@@ -12374,7 +12401,7 @@ dissect_h245_algorithm(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree
 static int
 dissect_h245_antiSpamAlgorithm(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree)
 {
-       offset=dissect_per_object_identifier(tvb, offset, pinfo, tree, hf_h245_antiSpamAlgorithm);
+       offset=dissect_per_object_identifier(tvb, offset, pinfo, tree, hf_h245_antiSpamAlgorithm, NULL);
        return offset;
 }
 
@@ -12384,7 +12411,7 @@ dissect_h245_antiSpamAlgorithm(tvbuff_t *tvb, int offset, packet_info *pinfo, pr
 static int
 dissect_h245_standard_object(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree)
 {
-       offset=dissect_per_object_identifier(tvb, offset, pinfo, tree, hf_h245_standard_object);
+       offset=dissect_per_object_identifier(tvb, offset, pinfo, tree, hf_h245_standard_object, NULL);
        return offset;
 }
 
@@ -12393,7 +12420,7 @@ dissect_h245_standard_object(tvbuff_t *tvb, int offset, packet_info *pinfo, prot
 static int
 dissect_h245_oid(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree)
 {
-       offset=dissect_per_object_identifier(tvb, offset, pinfo, tree, hf_h245_oid);
+       offset=dissect_per_object_identifier(tvb, offset, pinfo, tree, hf_h245_oid, NULL);
        return offset;
 }
 
@@ -12403,7 +12430,7 @@ dissect_h245_oid(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree
 static int
 dissect_h245_escrowID(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree)
 {
-       offset=dissect_per_object_identifier(tvb, offset, pinfo, tree, hf_h245_escrowID);
+       offset=dissect_per_object_identifier(tvb, offset, pinfo, tree, hf_h245_escrowID, NULL);
        return offset;
 }
 
@@ -12413,38 +12440,64 @@ dissect_h245_escrowID(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree
 static int
 dissect_h245_field(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree)
 {
-       offset=dissect_per_object_identifier(tvb, offset, pinfo, tree, hf_h245_field);
+       offset=dissect_per_object_identifier(tvb, offset, pinfo, tree, hf_h245_field, NULL);
        return offset;
 }
 
 
 
 
+/* dissect_h245_NonStandardIdentifier is used for H.245 */
+
 static const value_string NonStandardIdentifier_vals[] = {
        { 0,    "object" },
        { 1,    "h221NonStandard" },
        { 0, NULL }
 };
 static per_choice_t NonStandardIdentifier_choice[] = {
-       { 0,    "object", NO_EXTENSIONS,
+       { 0,    "object", ASN1_NO_EXTENSIONS,
                dissect_h245_object },
-       { 1,    "h221NonStandard", NO_EXTENSIONS, 
+       { 1,    "h221NonStandard", ASN1_NO_EXTENSIONS,
                dissect_h245_h221NonStandard },
        { 0, NULL, 0, NULL }
 };
 static int
 dissect_h245_NonStandardIdentifier(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree)
 {
-       offset=dissect_per_choice(tvb, offset, pinfo, tree, hf_h245_NonStandardIdentifier, ett_h245_NonStandardIdentifier, NonStandardIdentifier_choice, "NonStandardIdentifier", NULL);
+       guint32 value;
+
+       *object = '\0';
+       h221NonStandard = 0;
+
+       offset=dissect_per_choice(tvb, offset, pinfo, tree, hf_h245_NonStandardIdentifier, ett_h245_NonStandardIdentifier, NonStandardIdentifier_choice, "NonStandardIdentifier", &value);
+
+       switch (value) {
+               case 0 :  /* object */
+                       nsp_handle = dissector_get_string_handle(nsp_object_dissector_table, object);
+                       break;
+               case 1 :  /* h221NonStandard */
+                       nsp_handle = dissector_get_port_handle(nsp_h221_dissector_table, h221NonStandard);
+                       break;
+               default :
+                       nsp_handle = NULL;
+    }
 
        return offset;
 }
 
-
 static int
 dissect_h245_NonStandardParameterData(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree)
 {
-       offset=dissect_per_octet_string(tvb, offset, pinfo, tree, hf_h245_NonStandardParameterData, -1, -1);
+       guint32 value_offset, value_len;
+       tvbuff_t *next_tvb;
+
+       if (nsp_handle) {
+               offset=dissect_per_octet_string(tvb, offset, pinfo, tree, -1, -1, -1, &value_offset, &value_len);
+               next_tvb = tvb_new_subset(tvb, value_offset, value_len, value_len);
+               call_dissector(nsp_handle, next_tvb, pinfo, tree);
+       } else {
+               offset=dissect_per_octet_string(tvb, offset, pinfo, tree, hf_h245_NonStandardParameterData, -1, -1, NULL, NULL);
+       }
        return offset;
 }
 
@@ -12454,7 +12507,7 @@ dissect_h245_NonStandardParameterData(tvbuff_t *tvb, int offset, packet_info *pi
 static int
 dissect_h245_nlpidData(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree)
 {
-       offset=dissect_per_octet_string(tvb, offset, pinfo, tree, hf_h245_nlpidData, -1, -1);
+       offset=dissect_per_octet_string(tvb, offset, pinfo, tree, hf_h245_nlpidData, -1, -1, NULL, NULL);
        return offset;
 }
 
@@ -12464,7 +12517,7 @@ dissect_h245_nlpidData(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree
 static int
 dissect_h245_nonCollapsingRaw(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree)
 {
-       offset=dissect_per_octet_string(tvb, offset, pinfo, tree, hf_h245_nonCollapsingRaw, -1, -1);
+       offset=dissect_per_octet_string(tvb, offset, pinfo, tree, hf_h245_nonCollapsingRaw, -1, -1, NULL, NULL);
        return offset;
 }
 
@@ -12473,7 +12526,7 @@ dissect_h245_nonCollapsingRaw(tvbuff_t *tvb, int offset, packet_info *pinfo, pro
 static int
 dissect_h245_uuid(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree)
 {
-       offset=dissect_per_octet_string(tvb, offset, pinfo, tree, hf_h245_uuid, 16, 16);
+       offset=dissect_per_octet_string(tvb, offset, pinfo, tree, hf_h245_uuid, 16, 16, NULL, NULL);
        return offset;
 }
 
@@ -12483,7 +12536,7 @@ dissect_h245_uuid(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tre
 static int
 dissect_h245_octetString(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree)
 {
-       offset=dissect_per_octet_string(tvb, offset, pinfo, tree, hf_h245_octetString, -1, -1);
+       offset=dissect_per_octet_string(tvb, offset, pinfo, tree, hf_h245_octetString, -1, -1, NULL, NULL);
        return offset;
 }
 
@@ -12493,7 +12546,7 @@ dissect_h245_octetString(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tr
 static int
 dissect_h245_externalReference(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree)
 {
-       offset=dissect_per_octet_string(tvb, offset, pinfo, tree, hf_h245_externalReference, 1, 255);
+       offset=dissect_per_octet_string(tvb, offset, pinfo, tree, hf_h245_externalReference, 1, 255, NULL, NULL);
        return offset;
 }
 
@@ -12503,7 +12556,7 @@ dissect_h245_externalReference(tvbuff_t *tvb, int offset, packet_info *pinfo, pr
 static int
 dissect_h245_nsapAddress(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree)
 {
-       offset=dissect_per_octet_string(tvb, offset, pinfo, tree, hf_h245_nsapAddress, 1, 20);
+       offset=dissect_per_octet_string(tvb, offset, pinfo, tree, hf_h245_nsapAddress, 1, 20, NULL, NULL);
        return offset;
 }
 
@@ -12513,7 +12566,7 @@ dissect_h245_nsapAddress(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tr
 static int
 dissect_h245_subaddress_1_20(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree)
 {
-       offset=dissect_per_octet_string(tvb, offset, pinfo, tree, hf_h245_subaddress_1_20, 1, 20);
+       offset=dissect_per_octet_string(tvb, offset, pinfo, tree, hf_h245_subaddress_1_20, 1, 20, NULL, NULL);
        return offset;
 }
 
@@ -12523,7 +12576,7 @@ dissect_h245_subaddress_1_20(tvbuff_t *tvb, int offset, packet_info *pinfo, prot
 static int
 dissect_h245_programDescriptors(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree)
 {
-       offset=dissect_per_octet_string(tvb, offset, pinfo, tree, hf_h245_programDescriptors, -1, -1);
+       offset=dissect_per_octet_string(tvb, offset, pinfo, tree, hf_h245_programDescriptors, -1, -1, NULL, NULL);
        return offset;
 }
 
@@ -12532,7 +12585,7 @@ dissect_h245_programDescriptors(tvbuff_t *tvb, int offset, packet_info *pinfo, p
 static int
 dissect_h245_streamDescriptors(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree)
 {
-       offset=dissect_per_octet_string(tvb, offset, pinfo, tree, hf_h245_streamDescriptors, -1, -1);
+       offset=dissect_per_octet_string(tvb, offset, pinfo, tree, hf_h245_streamDescriptors, -1, -1, NULL, NULL);
        return offset;
 }
 
@@ -12542,15 +12595,13 @@ dissect_h245_streamDescriptors(tvbuff_t *tvb, int offset, packet_info *pinfo, pr
 static int
 dissect_h245_ipv4network(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree)
 {
-       guint32 ip;
-
        /* byte aligned */
        if(offset&0x07){
                offset=(offset&0xfffffff8)+8;
        }
-       ip=tvb_get_letohl(tvb, offset>>3);
-       proto_tree_add_ipv4(tree, hf_h245_ipv4network, tvb, offset>>3, 4, ip);
-       
+       tvb_memcpy(tvb, (char *)&ipv4_address, offset>>3, 4);
+       proto_tree_add_ipv4(tree, hf_h245_ipv4network, tvb, offset>>3, 4, ipv4_address);
+
        offset+=32;
        return offset;
 }
@@ -12560,7 +12611,7 @@ dissect_h245_ipv4network(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, prot
 static int
 dissect_h245_ipxNode(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree)
 {
-       offset=dissect_per_octet_string(tvb, offset, pinfo, tree, hf_h245_ipxNode, 6, 6);
+       offset=dissect_per_octet_string(tvb, offset, pinfo, tree, hf_h245_ipxNode, 6, 6, NULL, NULL);
        return offset;
 }
 
@@ -12569,7 +12620,7 @@ dissect_h245_ipxNode(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *
 static int
 dissect_h245_ipxNetnum(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree)
 {
-       offset=dissect_per_octet_string(tvb, offset, pinfo, tree, hf_h245_ipxNetnum, 4, 4);
+       offset=dissect_per_octet_string(tvb, offset, pinfo, tree, hf_h245_ipxNetnum, 4, 4, NULL, NULL);
        return offset;
 }
 
@@ -12579,7 +12630,7 @@ dissect_h245_ipxNetnum(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree
 static int
 dissect_h245_ipv6network(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree)
 {
-       offset=dissect_per_octet_string(tvb, offset, pinfo, tree, hf_h245_ipv6network, 16, 16);
+       offset=dissect_per_octet_string(tvb, offset, pinfo, tree, hf_h245_ipv6network, 16, 16, NULL, NULL);
        return offset;
 }
 
@@ -12588,7 +12639,7 @@ dissect_h245_ipv6network(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tr
 static int
 dissect_h245_netBios(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree)
 {
-       offset=dissect_per_octet_string(tvb, offset, pinfo, tree, hf_h245_netBios, 16, 16);
+       offset=dissect_per_octet_string(tvb, offset, pinfo, tree, hf_h245_netBios, 16, 16, NULL, NULL);
        return offset;
 }
 
@@ -12598,7 +12649,7 @@ dissect_h245_netBios(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *
 static int
 dissect_h245_nsap(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree)
 {
-       offset=dissect_per_octet_string(tvb, offset, pinfo, tree, hf_h245_nsap, 1, 20);
+       offset=dissect_per_octet_string(tvb, offset, pinfo, tree, hf_h245_nsap, 1, 20, NULL, NULL);
        return offset;
 }
 
@@ -12608,7 +12659,7 @@ dissect_h245_nsap(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tre
 static int
 dissect_h245_h235Key(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree)
 {
-       offset=dissect_per_octet_string(tvb, offset, pinfo, tree, hf_h245_h235Key, 1, 65535);
+       offset=dissect_per_octet_string(tvb, offset, pinfo, tree, hf_h245_h235Key, 1, 65535, NULL, NULL);
        return offset;
 }
 
@@ -12617,7 +12668,7 @@ dissect_h245_h235Key(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *
 static int
 dissect_h245_value(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree)
 {
-       offset=dissect_per_octet_string(tvb, offset, pinfo, tree, hf_h245_value, 1, 65535);
+       offset=dissect_per_octet_string(tvb, offset, pinfo, tree, hf_h245_value, 1, 65535, NULL, NULL);
        return offset;
 }
 
@@ -12627,7 +12678,7 @@ dissect_h245_value(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tr
 static int
 dissect_h245_certificateResponse(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree)
 {
-       offset=dissect_per_octet_string(tvb, offset, pinfo, tree, hf_h245_certificateResponse, 1, 65535);
+       offset=dissect_per_octet_string(tvb, offset, pinfo, tree, hf_h245_certificateResponse, 1, 65535, NULL, NULL);
        return offset;
 }
 
@@ -12637,7 +12688,7 @@ dissect_h245_certificateResponse(tvbuff_t *tvb, int offset, packet_info *pinfo,
 static int
 dissect_h245_TerminalID(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree)
 {
-       offset=dissect_per_octet_string(tvb, offset, pinfo, tree, hf_h245_TerminalID, 1, 128);
+       offset=dissect_per_octet_string(tvb, offset, pinfo, tree, hf_h245_TerminalID, 1, 128, NULL, NULL);
        return offset;
 }
 
@@ -12646,7 +12697,7 @@ dissect_h245_TerminalID(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tre
 static int
 dissect_h245_ConferenceID(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree)
 {
-       offset=dissect_per_octet_string(tvb, offset, pinfo, tree, hf_h245_ConferenceID, 1, 32);
+       offset=dissect_per_octet_string(tvb, offset, pinfo, tree, hf_h245_ConferenceID, 1, 32, NULL, NULL);
        return offset;
 }
 
@@ -12655,7 +12706,7 @@ dissect_h245_ConferenceID(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_t
 static int
 dissect_h245_Password(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree)
 {
-       offset=dissect_per_octet_string(tvb, offset, pinfo, tree, hf_h245_Password, 1, 32);
+       offset=dissect_per_octet_string(tvb, offset, pinfo, tree, hf_h245_Password, 1, 32, NULL, NULL);
        return offset;
 }
 
@@ -12665,7 +12716,7 @@ dissect_h245_Password(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree
 static int
 dissect_h245_encryptionSE(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree)
 {
-       offset=dissect_per_octet_string(tvb, offset, pinfo, tree, hf_h245_encryptionSE, -1, -1);
+       offset=dissect_per_octet_string(tvb, offset, pinfo, tree, hf_h245_encryptionSE, -1, -1, NULL, NULL);
        return offset;
 }
 
@@ -12674,7 +12725,7 @@ dissect_h245_encryptionSE(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_t
 static int
 dissect_h245_conferenceIdentifier(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree)
 {
-       offset=dissect_per_octet_string(tvb, offset, pinfo, tree, hf_h245_conferenceIdentifier, 1, 16);
+       offset=dissect_per_octet_string(tvb, offset, pinfo, tree, hf_h245_conferenceIdentifier, 1, 16, NULL, NULL);
        return offset;
 }
 
@@ -12684,7 +12735,7 @@ dissect_h245_conferenceIdentifier(tvbuff_t *tvb, int offset, packet_info *pinfo,
 static int
 dissect_h245_returnedFunction(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree)
 {
-       offset=dissect_per_octet_string(tvb, offset, pinfo, tree, hf_h245_returnedFunction, -1, -1);
+       offset=dissect_per_octet_string(tvb, offset, pinfo, tree, hf_h245_returnedFunction, -1, -1, NULL, NULL);
        return offset;
 }
 
@@ -12694,7 +12745,7 @@ dissect_h245_returnedFunction(tvbuff_t *tvb, int offset, packet_info *pinfo, pro
 static int
 dissect_h245_productNumber(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree)
 {
-       offset=dissect_per_octet_string(tvb, offset, pinfo, tree, hf_h245_productNumber, 1, 256);
+       offset=dissect_per_octet_string(tvb, offset, pinfo, tree, hf_h245_productNumber, 1, 256, NULL, NULL);
        return offset;
 }
 
@@ -12704,7 +12755,7 @@ dissect_h245_productNumber(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_
 static int
 dissect_h245_versionNumber(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree)
 {
-       offset=dissect_per_octet_string(tvb, offset, pinfo, tree, hf_h245_versionNumber, 1, 256);
+       offset=dissect_per_octet_string(tvb, offset, pinfo, tree, hf_h245_versionNumber, 1, 256, NULL, NULL);
        return offset;
 }
 
@@ -12713,15 +12764,15 @@ dissect_h245_versionNumber(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_
 
 
 static per_sequence_t H222LogicalChannelParameters_sequence[] = {
-       { "resourceID", EXTENSION_ROOT, NOT_OPTIONAL,
+       { "resourceID", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_resourceID },
-       { "subChannelID", EXTENSION_ROOT, NOT_OPTIONAL,
+       { "subChannelID", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_subChannelID },
-       { "pcr-pid", EXTENSION_ROOT, OPTIONAL,
+       { "pcr-pid", ASN1_EXTENSION_ROOT, ASN1_OPTIONAL,
                dissect_h245_pcr_pid },
-       { "programDescriptors", EXTENSION_ROOT, OPTIONAL,
+       { "programDescriptors", ASN1_EXTENSION_ROOT, ASN1_OPTIONAL,
                dissect_h245_programDescriptors },
-       { "streamDescriptors", EXTENSION_ROOT, OPTIONAL,
+       { "streamDescriptors", ASN1_EXTENSION_ROOT, ASN1_OPTIONAL,
                dissect_h245_streamDescriptors },
        { NULL, 0, 0, NULL }
 };
@@ -12738,9 +12789,9 @@ dissect_h245_H222LogicalChannelParameters(tvbuff_t *tvb, int offset, packet_info
 
 
 static per_sequence_t UnicastAddress_iPAddress_sequence[] = {
-       { "network", EXTENSION_ROOT, NOT_OPTIONAL,
+       { "network", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_ipv4network },
-       { "tsapIdentifier", EXTENSION_ROOT, NOT_OPTIONAL,
+       { "tsapIdentifier", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_tsapIdentifier },
        { NULL, 0, 0, NULL }
 };
@@ -12755,11 +12806,11 @@ dissect_h245_UnicastAddress_iPAddress(tvbuff_t *tvb, int offset, packet_info *pi
 
 
 static per_sequence_t UnicastAddress_iPXAddress_sequence[] = {
-       { "node", EXTENSION_ROOT, NOT_OPTIONAL,
+       { "node", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_ipxNode },
-       { "netnum", EXTENSION_ROOT, NOT_OPTIONAL,
+       { "netnum", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_ipxNetnum },
-       { "tsapIdentifier", EXTENSION_ROOT, NOT_OPTIONAL,
+       { "tsapIdentifier", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_tsapIdentifier },
        { NULL, 0, 0, NULL }
 };
@@ -12775,9 +12826,9 @@ dissect_h245_UnicastAddress_iPXAddress(tvbuff_t *tvb, int offset, packet_info *p
 
 
 static per_sequence_t UnicastAddress_iP6Address_sequence[] = {
-       { "network", EXTENSION_ROOT, NOT_OPTIONAL,
+       { "network", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_ipv6network },
-       { "tsapIdentifier", EXTENSION_ROOT, NOT_OPTIONAL,
+       { "tsapIdentifier", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_tsapIdentifier },
        { NULL, 0, 0, NULL }
 };
@@ -12794,11 +12845,11 @@ dissect_h245_UnicastAddress_iP6Address(tvbuff_t *tvb, int offset, packet_info *p
 
 
 static per_sequence_t VendorIdentification_sequence[] = {
-       { "vendor", EXTENSION_ROOT, NOT_OPTIONAL,
+       { "vendor", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_NonStandardIdentifier },
-       { "productNumber", EXTENSION_ROOT, OPTIONAL,
+       { "productNumber", ASN1_EXTENSION_ROOT, ASN1_OPTIONAL,
                dissect_h245_productNumber },
-       { "versionNumber", EXTENSION_ROOT, OPTIONAL,
+       { "versionNumber", ASN1_EXTENSION_ROOT, ASN1_OPTIONAL,
                dissect_h245_versionNumber },
        { NULL, 0, 0, NULL }
 };
@@ -12814,9 +12865,9 @@ dissect_h245_VendorIdentification(tvbuff_t *tvb, int offset, packet_info *pinfo,
 
 
 static per_sequence_t MulticastAddress_iPAddress_sequence[] = {
-       { "network", EXTENSION_ROOT, NOT_OPTIONAL,
+       { "network", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_ipv4network },
-       { "tsapIdentifier", EXTENSION_ROOT, NOT_OPTIONAL,
+       { "tsapIdentifier", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_tsapIdentifier },
        { NULL, 0, 0, NULL }
 };
@@ -12832,9 +12883,9 @@ dissect_h245_MulticastAddress_iPAddress(tvbuff_t *tvb, int offset, packet_info *
 
 
 static per_sequence_t MulticastAddress_iP6Address_sequence[] = {
-       { "network", EXTENSION_ROOT, NOT_OPTIONAL,
+       { "network", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_ipv6network },
-       { "tsapIdentifier", EXTENSION_ROOT, NOT_OPTIONAL, 
+       { "tsapIdentifier", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_tsapIdentifier },
        { NULL, 0, 0, NULL }
 };
@@ -12851,9 +12902,9 @@ dissect_h245_MulticastAddress_iP6Address(tvbuff_t *tvb, int offset, packet_info
 
 
 static per_sequence_t Criteria_sequence[] = {
-       { "field", EXTENSION_ROOT, NOT_OPTIONAL,
+       { "field", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_field },
-       { "value", EXTENSION_ROOT, NOT_OPTIONAL,
+       { "value", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_value },
        { NULL, 0, 0, NULL }
 };
@@ -12869,9 +12920,9 @@ dissect_h245_Criteria(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree
 
 
 static per_sequence_t ConferenceResponse_mCterminalIDResponse_sequence[] = {
-       { "terminalLabel", EXTENSION_ROOT, NOT_OPTIONAL,
+       { "terminalLabel", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_TerminalLabel },
-       { "terminalID", EXTENSION_ROOT, NOT_OPTIONAL,
+       { "terminalID", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_TerminalID },
        { NULL, 0, 0, NULL }
 };
@@ -12887,9 +12938,9 @@ dissect_h245_ConferenceResponse_mCterminalIDResponse(tvbuff_t *tvb, int offset,
 
 
 static per_sequence_t ConferenceResponse_conferenceIDResponse_sequence[] = {
-       { "terminalLabel", EXTENSION_ROOT, NOT_OPTIONAL,
+       { "terminalLabel", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_TerminalLabel },
-       { "conferenceID", EXTENSION_ROOT, NOT_OPTIONAL,
+       { "conferenceID", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_ConferenceID },
        { NULL, 0, 0, NULL }
 };
@@ -12905,9 +12956,9 @@ dissect_h245_ConferenceResponse_conferenceIDResponse(tvbuff_t *tvb, int offset,
 
 
 static per_sequence_t ConferenceResponse_passwordResponse_sequence[] = {
-       { "terminalLabel", EXTENSION_ROOT, NOT_OPTIONAL,
+       { "terminalLabel", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_TerminalLabel },
-       { "password", EXTENSION_ROOT, NOT_OPTIONAL,
+       { "password", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_Password },
        { NULL, 0, 0, NULL }
 };
@@ -12924,7 +12975,7 @@ dissect_h245_ConferenceResponse_passwordResponse(tvbuff_t *tvb, int offset, pack
 
 
 static per_sequence_t ConferenceResponse_extensionAddressResponse_sequence[] = {
-       { "extensionAddress", EXTENSION_ROOT, NOT_OPTIONAL,
+       { "extensionAddress", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_TerminalID },
        { NULL, 0, 0, NULL }
 };
@@ -12940,9 +12991,9 @@ dissect_h245_ConferenceResponse_extensionAddressResponse(tvbuff_t *tvb, int offs
 
 
 static per_sequence_t ConferenceResponse_chairTokenOwnerResponse_sequence[] = {
-       { "terminalLabel", EXTENSION_ROOT, NOT_OPTIONAL,
+       { "terminalLabel", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_TerminalLabel },
-       { "terminalID", EXTENSION_ROOT, NOT_OPTIONAL,
+       { "terminalID", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_TerminalID },
        { NULL, 0, 0, NULL }
 };
@@ -12958,9 +13009,9 @@ dissect_h245_ConferenceResponse_chairTokenOwnerResponse(tvbuff_t *tvb, int offse
 
 
 static per_sequence_t ConferenceResponse_terminalCertificateResponse_sequence[] = {
-       { "terminalLabel", EXTENSION_ROOT, NOT_OPTIONAL,
+       { "terminalLabel", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_TerminalLabel },
-       { "certificateResponse", EXTENSION_ROOT, OPTIONAL,
+       { "certificateResponse", ASN1_EXTENSION_ROOT, ASN1_OPTIONAL,
                dissect_h245_certificateResponse },
        { NULL, 0, 0, NULL }
 };
@@ -12976,9 +13027,9 @@ dissect_h245_ConferenceResponse_terminalCertificateResponse(tvbuff_t *tvb, int o
 
 
 static per_sequence_t TerminalInformation_sequence[] = {
-       { "terminalLabel", EXTENSION_ROOT, NOT_OPTIONAL,
+       { "terminalLabel", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_TerminalLabel },
-       { "terminalID", EXTENSION_ROOT, NOT_OPTIONAL,
+       { "terminalID", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_TerminalID },
        { NULL, 0, 0, NULL }
 };
@@ -12993,7 +13044,7 @@ dissect_h245_TerminalInformation(tvbuff_t *tvb, int offset, packet_info *pinfo,
 
 
 static per_sequence_t SubstituteConferenceIDCommand_sequence[] = {
-       { "conferenceIdentifier", EXTENSION_ROOT, NOT_OPTIONAL,
+       { "conferenceIdentifier", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_conferenceIdentifier },
        { NULL, 0, 0, NULL }
 };
@@ -13020,21 +13071,21 @@ static const value_string ConferenceCommand_vals[] = {
        {  0, NULL }
 };
 static per_choice_t ConferenceCommand_choice[] = {
-       {  0, "broadcastMyLogicalChannel", EXTENSION_ROOT, 
+       {  0, "broadcastMyLogicalChannel", ASN1_EXTENSION_ROOT,
                dissect_h245_LogicalChannelNumber },
-       {  1, "cancelBroadcastMyLogicalChannel", EXTENSION_ROOT, 
+       {  1, "cancelBroadcastMyLogicalChannel", ASN1_EXTENSION_ROOT,
                dissect_h245_LogicalChannelNumber },
-       {  2, "makeTerminalBroadcaster", EXTENSION_ROOT,
+       {  2, "makeTerminalBroadcaster", ASN1_EXTENSION_ROOT,
                dissect_h245_TerminalLabel },
-       {  3, "cancelMakeTerminalBroadcaster", EXTENSION_ROOT, 
+       {  3, "cancelMakeTerminalBroadcaster", ASN1_EXTENSION_ROOT,
                dissect_h245_NULL },
-       {  4, "sendThisSource", EXTENSION_ROOT,
+       {  4, "sendThisSource", ASN1_EXTENSION_ROOT,
                dissect_h245_TerminalLabel },
-       {  5, "cancelSendThisSource", EXTENSION_ROOT, 
+       {  5, "cancelSendThisSource", ASN1_EXTENSION_ROOT,
                dissect_h245_NULL },
-       {  6, "dropConference", EXTENSION_ROOT, 
+       {  6, "dropConference", ASN1_EXTENSION_ROOT,
                dissect_h245_NULL },
-       {  7, "substituteConferenceIDCommand", NOT_EXTENSION_ROOT,
+       {  7, "substituteConferenceIDCommand", ASN1_NOT_EXTENSION_ROOT,
                dissect_h245_SubstituteConferenceIDCommand },
        {  0, NULL, 0, NULL }
 };
@@ -13050,9 +13101,9 @@ dissect_h245_ConferenceCommand(tvbuff_t *tvb, int offset, packet_info *pinfo, pr
 
 
 static per_sequence_t FunctionNotSupported_sequence[] = {
-       { "cause", EXTENSION_ROOT, NOT_OPTIONAL, 
+       { "cause", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_FunctionNotSupported_cause },
-       { "returnedFunction", EXTENSION_ROOT, OPTIONAL,
+       { "returnedFunction", ASN1_EXTENSION_ROOT, ASN1_OPTIONAL,
                dissect_h245_returnedFunction },
        { NULL, 0, 0, NULL }
 };
@@ -13067,26 +13118,25 @@ dissect_h245_FunctionNotSupported(tvbuff_t *tvb, int offset, packet_info *pinfo,
 
 
 
+/* dissect_h245_NonStandardParameter is used for H.245 */
 
 static per_sequence_t NonStandardParameter_sequence[] = {
-       { "nonStandardIdentifier", NO_EXTENSIONS, NOT_OPTIONAL,
+       { "nonStandardIdentifier", ASN1_NO_EXTENSIONS, ASN1_NOT_OPTIONAL,
                dissect_h245_NonStandardIdentifier },
-       { "data", NO_EXTENSIONS, NOT_OPTIONAL,
+       { "data", ASN1_NO_EXTENSIONS, ASN1_NOT_OPTIONAL,
                dissect_h245_NonStandardParameterData },
        { NULL, 0, 0, NULL }
 };
 int
 dissect_h245_NonStandardParameter(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree)
 {
+       nsp_handle = NULL;
+
        offset=dissect_per_sequence(tvb, offset, pinfo, tree, hf_h245_NonStandardParameter, ett_h245_NonStandardParameter, NonStandardParameter_sequence);
 
        return offset;
 }
 
-
-
-
-
 static const value_string DataProtocolCapability_vals[] = {
        {  0, "nonStandard" },
        {  1, "v14buffered" },
@@ -13105,33 +13155,33 @@ static const value_string DataProtocolCapability_vals[] = {
        {  0, NULL }
 };
 static per_choice_t DataProtocolCapability_choice[] = {
-       {  0, "nonStandard", EXTENSION_ROOT,
+       {  0, "nonStandard", ASN1_EXTENSION_ROOT,
                        dissect_h245_NonStandardParameter },
-       {  1, "v14buffered", EXTENSION_ROOT, 
+       {  1, "v14buffered", ASN1_EXTENSION_ROOT,
                        dissect_h245_NULL },
-       {  2, "v42lapm", EXTENSION_ROOT, 
+       {  2, "v42lapm", ASN1_EXTENSION_ROOT,
                        dissect_h245_NULL },
-       {  3, "hdlcFrameTunnelling", EXTENSION_ROOT, 
+       {  3, "hdlcFrameTunnelling", ASN1_EXTENSION_ROOT,
                        dissect_h245_NULL },
-       {  4, "h310SeparateVCStack", EXTENSION_ROOT, 
+       {  4, "h310SeparateVCStack", ASN1_EXTENSION_ROOT,
                        dissect_h245_NULL },
-       {  5, "h310SingleVCStack", EXTENSION_ROOT, 
+       {  5, "h310SingleVCStack", ASN1_EXTENSION_ROOT,
                        dissect_h245_NULL },
-       {  6, "transparent", EXTENSION_ROOT, 
+       {  6, "transparent", ASN1_EXTENSION_ROOT,
                        dissect_h245_NULL },
-       {  7, "segmentationAndReassembly", NOT_EXTENSION_ROOT, 
+       {  7, "segmentationAndReassembly", ASN1_NOT_EXTENSION_ROOT,
                        dissect_h245_NULL },
-       {  8, "hdlcFrameTunnelingwSAR", NOT_EXTENSION_ROOT, 
+       {  8, "hdlcFrameTunnelingwSAR", ASN1_NOT_EXTENSION_ROOT,
                        dissect_h245_NULL },
-       {  9, "v120", NOT_EXTENSION_ROOT, 
+       {  9, "v120", ASN1_NOT_EXTENSION_ROOT,
                        dissect_h245_NULL },
-       { 10, "separateLANStack", NOT_EXTENSION_ROOT, 
+       { 10, "separateLANStack", ASN1_NOT_EXTENSION_ROOT,
                        dissect_h245_NULL },
-       { 11, "v76wCompression", NOT_EXTENSION_ROOT,
+       { 11, "v76wCompression", ASN1_NOT_EXTENSION_ROOT,
                        dissect_h245_DataProtocolCapability_v76wCompression },
-       { 12, "tcp", NOT_EXTENSION_ROOT, 
+       { 12, "tcp", ASN1_NOT_EXTENSION_ROOT,
                        dissect_h245_NULL },
-       { 13, "udp", NOT_EXTENSION_ROOT, 
+       { 13, "udp", ASN1_NOT_EXTENSION_ROOT,
                        dissect_h245_NULL },
        {  0, NULL, 0, NULL }
 };
@@ -13152,9 +13202,9 @@ static const value_string MediaEncryptionAlgorithm_vals[] = {
        {  0, NULL }
 };
 static per_choice_t MediaEncryptionAlgorithm_choice[] = {
-       {  0, "nonStandard", EXTENSION_ROOT,
+       {  0, "nonStandard", ASN1_EXTENSION_ROOT,
                dissect_h245_NonStandardParameter },
-       {  1, "algorithm", EXTENSION_ROOT,
+       {  1, "algorithm", ASN1_EXTENSION_ROOT,
                dissect_h245_algorithm },
        {  0, NULL, 0, NULL }
 };
@@ -13180,19 +13230,19 @@ static const value_string UserInputCapability_vals[] = {
        {  0, NULL }
 };
 static per_choice_t UserInputCapability_choice[] = {
-       {  0, "nonStandard", EXTENSION_ROOT,
+       {  0, "nonStandard", ASN1_EXTENSION_ROOT,
                        dissect_h245_NonStandardParameter },
-       {  1, "basicString", EXTENSION_ROOT, 
+       {  1, "basicString", ASN1_EXTENSION_ROOT,
                        dissect_h245_NULL },
-       {  2, "iA5String", EXTENSION_ROOT, 
+       {  2, "iA5String", ASN1_EXTENSION_ROOT,
                        dissect_h245_NULL },
-       {  3, "generalString", EXTENSION_ROOT, 
+       {  3, "generalString", ASN1_EXTENSION_ROOT,
                        dissect_h245_NULL },
-       {  4, "dtmf", EXTENSION_ROOT, 
+       {  4, "dtmf", ASN1_EXTENSION_ROOT,
                        dissect_h245_NULL },
-       {  5, "hookflash", EXTENSION_ROOT, 
+       {  5, "hookflash", ASN1_EXTENSION_ROOT,
                        dissect_h245_NULL },
-       {  6, "extendedAlphanumeric", NOT_EXTENSION_ROOT, 
+       {  6, "extendedAlphanumeric", ASN1_NOT_EXTENSION_ROOT,
                        dissect_h245_NULL },
        {  0, NULL, 0, NULL }
 };
@@ -13225,13 +13275,13 @@ static const value_string CapabilityIdentifier_vals[] = {
        {  0, NULL }
 };
 static per_choice_t CapabilityIdentifier_choice[] = {
-       {  0, "standard", EXTENSION_ROOT,
+       {  0, "standard", ASN1_EXTENSION_ROOT,
                dissect_h245_standard_object },
-       {  1, "h221NonStandard", EXTENSION_ROOT,
+       {  1, "h221NonStandard", ASN1_EXTENSION_ROOT,
                dissect_h245_NonStandardParameter },
-       {  2, "uuid", EXTENSION_ROOT,
+       {  2, "uuid", ASN1_EXTENSION_ROOT,
                dissect_h245_uuid },
-       {  3, "domainBased", EXTENSION_ROOT,
+       {  3, "domainBased", ASN1_EXTENSION_ROOT,
                dissect_h245_domainBased },
        {  0, NULL, 0, NULL }
 };
@@ -13254,13 +13304,13 @@ static const value_string ParameterIdentifier_vals[] = {
        {  0, NULL }
 };
 static per_choice_t ParameterIdentifier_choice[] = {
-       {  0, "standard", EXTENSION_ROOT,
+       {  0, "standard", ASN1_EXTENSION_ROOT,
                dissect_h245_standard_0_127 },
-       {  1, "h221NonStandard", EXTENSION_ROOT,
+       {  1, "h221NonStandard", ASN1_EXTENSION_ROOT,
                dissect_h245_NonStandardParameter },
-       {  2, "uuid", EXTENSION_ROOT,
+       {  2, "uuid", ASN1_EXTENSION_ROOT,
                dissect_h245_uuid },
-       {  3, "domainBased", EXTENSION_ROOT,
+       {  3, "domainBased", ASN1_EXTENSION_ROOT,
                dissect_h245_domainBased },
        {  0, NULL, 0, NULL }
 };
@@ -13286,23 +13336,23 @@ static const value_string H223LogicalChannelParameters_adaptationLayerType_vals[
        {  0, NULL }
 };
 static per_choice_t H223LogicalChannelParameters_adaptationLayerType_choice[] = {
-       {  0, "nonStandard", EXTENSION_ROOT,
+       {  0, "nonStandard", ASN1_EXTENSION_ROOT,
                        dissect_h245_NonStandardParameter },
-       {  1, "al1Framed", EXTENSION_ROOT, 
+       {  1, "al1Framed", ASN1_EXTENSION_ROOT,
                        dissect_h245_NULL },
-       {  2, "al1NotFramed", EXTENSION_ROOT, 
+       {  2, "al1NotFramed", ASN1_EXTENSION_ROOT,
                        dissect_h245_NULL },
-       {  3, "al2WithoutSequenceNumbers", EXTENSION_ROOT, 
+       {  3, "al2WithoutSequenceNumbers", ASN1_EXTENSION_ROOT,
                        dissect_h245_NULL },
-       {  4, "al2WithSequenceNumbers", EXTENSION_ROOT, 
+       {  4, "al2WithSequenceNumbers", ASN1_EXTENSION_ROOT,
                        dissect_h245_NULL },
-       {  5, "al3", EXTENSION_ROOT,
+       {  5, "al3", ASN1_EXTENSION_ROOT,
                        dissect_h245_H223LogicalChannelParameters_adaptionLayerType_al3 },
-       {  6, "al1M", NOT_EXTENSION_ROOT,
+       {  6, "al1M", ASN1_NOT_EXTENSION_ROOT,
                dissect_h245_H223AL1MParameters },
-       {  7, "al2M", NOT_EXTENSION_ROOT, 
+       {  7, "al2M", ASN1_NOT_EXTENSION_ROOT,
                dissect_h245_H223AL2MParameters },
-       {  8, "al3M", NOT_EXTENSION_ROOT,
+       {  8, "al3M", ASN1_NOT_EXTENSION_ROOT,
                dissect_h245_H223AL3MParameters },
        {  0, NULL, 0, NULL }
 };
@@ -13326,13 +13376,13 @@ static const value_string MulticastAddress_vals[] = {
        {  0, NULL }
 };
 static per_choice_t MulticastAddress_choice[] = {
-       {  0, "iPAddress", EXTENSION_ROOT,
+       {  0, "iPAddress", ASN1_EXTENSION_ROOT,
                dissect_h245_MulticastAddress_iPAddress },
-       {  1, "iP6Address", EXTENSION_ROOT,
+       {  1, "iP6Address", ASN1_EXTENSION_ROOT,
                dissect_h245_MulticastAddress_iP6Address },
-       {  2, "nsap", NOT_EXTENSION_ROOT,
+       {  2, "nsap", ASN1_NOT_EXTENSION_ROOT,
                dissect_h245_nsap },
-       {  3, "nonStandardAddress", NOT_EXTENSION_ROOT,
+       {  3, "nonStandardAddress", ASN1_NOT_EXTENSION_ROOT,
                dissect_h245_NonStandardParameter },
        {  0, NULL, 0, NULL }
 };
@@ -13360,23 +13410,23 @@ static const value_string H223ModeParameters_adaptationLayerType_vals[] = {
        {  0, NULL }
 };
 static per_choice_t H223ModeParameters_adaptationLayerType_choice[] = {
-       {  0, "nonStandard", EXTENSION_ROOT,
+       {  0, "nonStandard", ASN1_EXTENSION_ROOT,
                        dissect_h245_NonStandardParameter },
-       {  1, "al1Framed", EXTENSION_ROOT, 
+       {  1, "al1Framed", ASN1_EXTENSION_ROOT,
                        dissect_h245_NULL },
-       {  2, "al1NotFramed", EXTENSION_ROOT, 
+       {  2, "al1NotFramed", ASN1_EXTENSION_ROOT,
                        dissect_h245_NULL },
-       {  3, "al2WithoutSequenceNumbers", EXTENSION_ROOT, 
+       {  3, "al2WithoutSequenceNumbers", ASN1_EXTENSION_ROOT,
                        dissect_h245_NULL },
-       {  4, "al2WithSequenceNumbers", EXTENSION_ROOT, 
+       {  4, "al2WithSequenceNumbers", ASN1_EXTENSION_ROOT,
                        dissect_h245_NULL },
-       {  5, "al3", EXTENSION_ROOT,
+       {  5, "al3", ASN1_EXTENSION_ROOT,
                        dissect_h245_H223ModeParameters_adaptationLayerType_al3 },
-       {  6, "al1M", NOT_EXTENSION_ROOT,
+       {  6, "al1M", ASN1_NOT_EXTENSION_ROOT,
                        dissect_h245_H223AL1MParameters },
-       {  7, "al2M", NOT_EXTENSION_ROOT, 
+       {  7, "al2M", ASN1_NOT_EXTENSION_ROOT,
                        dissect_h245_H223AL2MParameters },
-       {  8, "al3M", NOT_EXTENSION_ROOT,
+       {  8, "al3M", ASN1_NOT_EXTENSION_ROOT,
                        dissect_h245_H223AL3MParameters },
        {  0, NULL, 0, NULL }
 };
@@ -13397,9 +13447,9 @@ static const value_string EncryptionMode_vals[] = {
        {  0, NULL }
 };
 static per_choice_t EncryptionMode_choice[] = {
-       {  0, "nonStandard", EXTENSION_ROOT,
+       {  0, "nonStandard", ASN1_EXTENSION_ROOT,
                dissect_h245_NonStandardParameter },
-       {  1, "h233Encryption", EXTENSION_ROOT, 
+       {  1, "h233Encryption", ASN1_EXTENSION_ROOT,
                dissect_h245_NULL },
        {  0, NULL, 0, NULL }
 };
@@ -13415,7 +13465,7 @@ dissect_h245_EncryptionMode(tvbuff_t *tvb, int offset, packet_info *pinfo, proto
 
 
 static per_sequence_t NonStandardMessage_sequence[] = {
-       { "nonStandardData", EXTENSION_ROOT, NOT_OPTIONAL,
+       { "nonStandardData", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_NonStandardParameter },
        { NULL, 0, 0, NULL }
 };
@@ -13438,11 +13488,11 @@ static const value_string MultilinkIndication_vals[] = {
        {  0, NULL }
 };
 static per_choice_t MultilinkIndication_choice[] = {
-       {  0, "nonStandard", EXTENSION_ROOT,
+       {  0, "nonStandard", ASN1_EXTENSION_ROOT,
                dissect_h245_NonStandardMessage },
-       {  1, "crcDesired", EXTENSION_ROOT,
+       {  1, "crcDesired", ASN1_EXTENSION_ROOT,
                dissect_h245_MultilinkIndication_crcDesired },
-       {  2, "excessiveError", EXTENSION_ROOT,
+       {  2, "excessiveError", ASN1_EXTENSION_ROOT,
                dissect_h245_MultilinkIndication_excessiveError },
        {  0, NULL, 0, NULL }
 };
@@ -13465,13 +13515,13 @@ static const value_string DialingInformationNetworkType_vals[] = {
        {  0, NULL }
 };
 static per_choice_t DialingInformationNetworkType_choice[] = {
-       {  0, "nonStandard", EXTENSION_ROOT,
+       {  0, "nonStandard", ASN1_EXTENSION_ROOT,
                dissect_h245_NonStandardMessage },
-       {  1, "n-isdn", EXTENSION_ROOT, 
+       {  1, "n-isdn", ASN1_EXTENSION_ROOT,
                dissect_h245_NULL },
-       {  2, "gstn", EXTENSION_ROOT, 
+       {  2, "gstn", ASN1_EXTENSION_ROOT,
                dissect_h245_NULL },
-       {  3, "mobile", NOT_EXTENSION_ROOT, 
+       {  3, "mobile", ASN1_NOT_EXTENSION_ROOT,
                dissect_h245_NULL },
        {  0, NULL, 0, NULL }
 };
@@ -13487,11 +13537,11 @@ dissect_h245_DialingInformationNetworkType(tvbuff_t *tvb, int offset, packet_inf
 
 
 static per_sequence_t QOSCapability_sequence[] = {
-       { "nonStandardData", EXTENSION_ROOT, OPTIONAL,
+       { "nonStandardData", ASN1_EXTENSION_ROOT, ASN1_OPTIONAL,
                dissect_h245_NonStandardParameter },
-       { "rsvpParameters", EXTENSION_ROOT, OPTIONAL,
+       { "rsvpParameters", ASN1_EXTENSION_ROOT, ASN1_OPTIONAL,
                dissect_h245_RSVPParameters },
-       { "atmParameters", EXTENSION_ROOT, OPTIONAL,
+       { "atmParameters", ASN1_EXTENSION_ROOT, ASN1_OPTIONAL,
                dissect_h245_ATMParameters },
        { NULL, 0, 0, NULL }
 };
@@ -13507,9 +13557,9 @@ dissect_h245_QOSCapability(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_
 
 
 static per_sequence_t DataApplicationCapability_application_t84_sequence[] = {
-       { "t84Protocol", NO_EXTENSIONS, NOT_OPTIONAL,
+       { "t84Protocol", ASN1_NO_EXTENSIONS, ASN1_NOT_OPTIONAL,
                dissect_h245_DataProtocolCapability },
-       { "t84Profile", NO_EXTENSIONS, NOT_OPTIONAL, 
+       { "t84Profile", ASN1_NO_EXTENSIONS, ASN1_NOT_OPTIONAL,
                dissect_h245_T84Profile },
        { NULL, 0, 0, NULL }
 };
@@ -13526,9 +13576,9 @@ dissect_h245_DataApplicationCapability_application_t84(tvbuff_t *tvb, int offset
 
 
 static per_sequence_t DataApplicationCapability_application_nlpid_sequence[] = {
-       { "nlpidProtocol", NO_EXTENSIONS, NOT_OPTIONAL,
+       { "nlpidProtocol", ASN1_NO_EXTENSIONS, ASN1_NOT_OPTIONAL,
                dissect_h245_DataProtocolCapability },
-       { "nlpidData", NO_EXTENSIONS, NOT_OPTIONAL,
+       { "nlpidData", ASN1_NO_EXTENSIONS, ASN1_NOT_OPTIONAL,
                dissect_h245_nlpidData },
        { NULL, 0, 0, NULL }
 };
@@ -13544,9 +13594,9 @@ dissect_h245_DataApplicationCapability_application_nlpid(tvbuff_t *tvb, int offs
 
 
 static per_sequence_t DataApplicationCapability_application_t38fax_sequence[] = {
-       { "t38FaxProtocol", NO_EXTENSIONS, NOT_OPTIONAL,
+       { "t38FaxProtocol", ASN1_NO_EXTENSIONS, ASN1_NOT_OPTIONAL,
                dissect_h245_DataProtocolCapability },
-       { "t38FaxProfile", NO_EXTENSIONS, NOT_OPTIONAL,
+       { "t38FaxProfile", ASN1_NO_EXTENSIONS, ASN1_NOT_OPTIONAL,
                dissect_h245_T38FaxProfile },
        { NULL, 0, 0, NULL }
 };
@@ -13562,9 +13612,9 @@ dissect_h245_DataApplicationCapability_application_t38fax(tvbuff_t *tvb, int off
 
 
 static per_sequence_t AuthenticationCapability_sequence[] = {
-       { "nonStandard", EXTENSION_ROOT, OPTIONAL,
+       { "nonStandard", ASN1_EXTENSION_ROOT, ASN1_OPTIONAL,
                dissect_h245_NonStandardParameter },
-       { "antiSpamAlgorithm", NOT_EXTENSION_ROOT, OPTIONAL,
+       { "antiSpamAlgorithm", ASN1_NOT_EXTENSION_ROOT, ASN1_OPTIONAL,
                dissect_h245_antiSpamAlgorithm },
        { NULL, 0, 0, NULL }
 };
@@ -13579,7 +13629,7 @@ dissect_h245_AuthenticationCapability(tvbuff_t *tvb, int offset, packet_info *pi
 
 
 static per_sequence_t IntegrityCapability_sequence[] = {
-       { "nonStandard", EXTENSION_ROOT, OPTIONAL,
+       { "nonStandard", ASN1_EXTENSION_ROOT, ASN1_OPTIONAL,
                dissect_h245_NonStandardParameter },
        { NULL, 0, 0, NULL }
 };
@@ -13595,9 +13645,9 @@ dissect_h245_IntegrityCapability(tvbuff_t *tvb, int offset, packet_info *pinfo,
 
 
 static per_sequence_t H223LogicalChannelParameters_sequence[] = {
-       { "adaptationLayerType", EXTENSION_ROOT, NOT_OPTIONAL,
+       { "adaptationLayerType", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_H223LogicalChannelParameters_adaptationLayerType },
-       { "segmentableFlag", EXTENSION_ROOT, NOT_OPTIONAL, 
+       { "segmentableFlag", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_segmentableFlag },
        { NULL, 0, 0, NULL }
 };
@@ -13613,11 +13663,11 @@ dissect_h245_H223LogicalChannelParameters(tvbuff_t *tvb, int offset, packet_info
 
 
 static per_sequence_t RequestChannelClose_sequence[] = {
-       { "forwardLogicalChannelNumber", EXTENSION_ROOT, NOT_OPTIONAL, 
+       { "forwardLogicalChannelNumber", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_LogicalChannelNumber },
-       { "qosCapability", NOT_EXTENSION_ROOT, OPTIONAL,
+       { "qosCapability", ASN1_NOT_EXTENSION_ROOT, ASN1_OPTIONAL,
                dissect_h245_QOSCapability },
-       { "reason", NOT_EXTENSION_ROOT, NOT_OPTIONAL, 
+       { "reason", ASN1_NOT_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_RequestChannelClose_reason },
        { NULL, 0, 0, NULL }
 };
@@ -13633,9 +13683,9 @@ dissect_h245_RequestChannelClose(tvbuff_t *tvb, int offset, packet_info *pinfo,
 
 
 static per_sequence_t DataMode_application_nlpid_sequence[] = {
-       { "nlpidProtocol", NO_EXTENSIONS, NOT_OPTIONAL,
+       { "nlpidProtocol", ASN1_NO_EXTENSIONS, ASN1_NOT_OPTIONAL,
                dissect_h245_DataProtocolCapability },
-       { "nlpidData", NO_EXTENSIONS, NOT_OPTIONAL,
+       { "nlpidData", ASN1_NO_EXTENSIONS, ASN1_NOT_OPTIONAL,
                dissect_h245_nlpidData },
        { NULL, 0, 0, NULL }
 };
@@ -13652,9 +13702,9 @@ dissect_h245_DataMode_application_nlpid(tvbuff_t *tvb, int offset, packet_info *
 
 
 static per_sequence_t DataMode_application_t38fax_sequence[] = {
-       { "t38FaxProtocol", NO_EXTENSIONS, NOT_OPTIONAL,
+       { "t38FaxProtocol", ASN1_NO_EXTENSIONS, ASN1_NOT_OPTIONAL,
                dissect_h245_DataProtocolCapability },
-       { "t38FaxProfile", NO_EXTENSIONS, NOT_OPTIONAL,
+       { "t38FaxProfile", ASN1_NO_EXTENSIONS, ASN1_NOT_OPTIONAL,
                dissect_h245_T38FaxProfile },
        { NULL, 0, 0, NULL }
 };
@@ -13670,9 +13720,9 @@ dissect_h245_DataMode_application_t38fax(tvbuff_t *tvb, int offset, packet_info
 
 
 static per_sequence_t EncryptionCommand_encryptionAlgorithmID_sequence[] = {
-       { "h233AlgorithmIdentifier", NO_EXTENSIONS, NOT_OPTIONAL, 
+       { "h233AlgorithmIdentifier", ASN1_NO_EXTENSIONS, ASN1_NOT_OPTIONAL,
                dissect_h245_SequenceNumber },
-       { "associatedAlgorithm", NO_EXTENSIONS, NOT_OPTIONAL,
+       { "associatedAlgorithm", ASN1_NO_EXTENSIONS, ASN1_NOT_OPTIONAL,
                dissect_h245_NonStandardParameter },
        { NULL, 0, 0, NULL }
 };
@@ -13695,11 +13745,11 @@ static const value_string EncryptionCommand_vals[] = {
        {  0, NULL }
 };
 static per_choice_t EncryptionCommand_choice[] = {
-       {  0, "encryptionSE", EXTENSION_ROOT, 
+       {  0, "encryptionSE", ASN1_EXTENSION_ROOT,
                dissect_h245_encryptionSE },
-       {  1, "encryptionIVRequest", EXTENSION_ROOT, 
+       {  1, "encryptionIVRequest", ASN1_EXTENSION_ROOT,
                dissect_h245_NULL },
-       {  2, "encryptionAlgorithmID", EXTENSION_ROOT,
+       {  2, "encryptionAlgorithmID", ASN1_EXTENSION_ROOT,
                dissect_h245_EncryptionCommand_encryptionAlgorithmID },
        {  0, NULL, 0, NULL }
 };
@@ -13722,13 +13772,13 @@ static const value_string EndSessionCommand_vals[] = {
        {  0, NULL }
 };
 static per_choice_t EndSessionCommand_choice[] = {
-       {  0,   "nonStandard",                  EXTENSION_ROOT,
+       {  0,   "nonStandard",                  ASN1_EXTENSION_ROOT,
                dissect_h245_NonStandardParameter },
-       {  1,   "disconnect",                   EXTENSION_ROOT, 
+       {  1,   "disconnect",                   ASN1_EXTENSION_ROOT,
                dissect_h245_NULL },
-       {  2,   "gstnOptions",                  EXTENSION_ROOT, 
+       {  2,   "gstnOptions",                  ASN1_EXTENSION_ROOT,
                dissect_h245_EndSessionCommand_gstnOptions },
-       {  3,   "isdnOptions",                  NOT_EXTENSION_ROOT, 
+       {  3,   "isdnOptions",                  ASN1_NOT_EXTENSION_ROOT,
                dissect_h245_EndSessionCommand_isdnOptions },
        {  0, NULL, 0, NULL }
 };
@@ -13748,7 +13798,7 @@ dissect_h245_EndSessionCommand(tvbuff_t *tvb, int offset, packet_info *pinfo, pr
 static int
 dissect_h245_AudioCapability(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree);
 static per_sequence_t VBDCapability_sequence[] = {
-       { "type", EXTENSION_ROOT, NOT_OPTIONAL,
+       { "type", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_AudioCapability },
        { NULL, 0, 0, NULL }
 };
@@ -13801,21 +13851,21 @@ static const value_string ParameterValue_vals[] = {
 };
 static int dissect_h245_genericParameter_sequence_of(tvbuff_t *, int, packet_info *, proto_tree *);
 static per_choice_t ParameterValue_choice[] = {
-       {  0, "logical", EXTENSION_ROOT, 
+       {  0, "logical", ASN1_EXTENSION_ROOT,
                        dissect_h245_NULL },
-       {  1, "booleanArray", EXTENSION_ROOT,
+       {  1, "booleanArray", ASN1_EXTENSION_ROOT,
                        dissect_h245_booleanArray },
-       {  2, "unsignedMin", EXTENSION_ROOT,
+       {  2, "unsignedMin", ASN1_EXTENSION_ROOT,
                        dissect_h245_unsignedMin },
-       {  3, "unsignedMax", EXTENSION_ROOT,
+       {  3, "unsignedMax", ASN1_EXTENSION_ROOT,
                        dissect_h245_unsignedMax },
-       {  4, "unsigned32Min", EXTENSION_ROOT,
+       {  4, "unsigned32Min", ASN1_EXTENSION_ROOT,
                        dissect_h245_unsigned32Min },
-       {  5, "unsigned32Max", EXTENSION_ROOT, 
+       {  5, "unsigned32Max", ASN1_EXTENSION_ROOT,
                        dissect_h245_unsigned32Max },
-       {  6, "octetString", EXTENSION_ROOT,
+       {  6, "octetString", ASN1_EXTENSION_ROOT,
                        dissect_h245_octetString },
-       {  7, "genericParameter", EXTENSION_ROOT,
+       {  7, "genericParameter", ASN1_EXTENSION_ROOT,
                        dissect_h245_genericParameter_sequence_of },
        {  0, NULL, 0, NULL }
 };
@@ -13830,11 +13880,11 @@ dissect_h245_ParameterValue(tvbuff_t *tvb, int offset, packet_info *pinfo, proto
 
 
 static per_sequence_t GenericParameter_sequence[] = {
-       { "parameterIdentifier", EXTENSION_ROOT, NOT_OPTIONAL,
+       { "parameterIdentifier", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_ParameterIdentifier },
-       { "parameterValue", EXTENSION_ROOT, NOT_OPTIONAL,
+       { "parameterValue", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_ParameterValue },
-       { "supersedes", EXTENSION_ROOT, OPTIONAL,
+       { "supersedes", ASN1_EXTENSION_ROOT, ASN1_OPTIONAL,
                dissect_h245_supersedes_sequence_of },
        { NULL, 0, 0, NULL }
 };
@@ -13875,12 +13925,12 @@ dissect_h245_nonCollapsing_sequence_of(tvbuff_t *tvb, int offset, packet_info *p
 }
 
 
-static int
-dissect_h245_secondary_REE_sequence_of(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree)
-{
 /* XXX */
 static int dissect_h245_RedundancyEncodingElement(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree);
 
+static int
+dissect_h245_secondary_REE_sequence_of(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree)
+{
        offset=dissect_per_sequence_of(tvb, offset, pinfo, tree, hf_h245_secondary_REE, ett_h245_secondary_REE, dissect_h245_RedundancyEncodingElement );
        return offset;
 }
@@ -13888,12 +13938,12 @@ static int dissect_h245_RedundancyEncodingElement(tvbuff_t *tvb, int offset, pac
 
 
 
-static int
-dissect_h245_elements_MPSE_sequence_of(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree)
-{
 /* XXX */
 static int dissect_h245_MultiplePayloadStreamElement(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree);
 
+static int
+dissect_h245_elements_MPSE_sequence_of(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree)
+{
        offset=dissect_per_sequence_of(tvb, offset, pinfo, tree, hf_h245_elements_MPSE, ett_h245_elements_MPSE, dissect_h245_MultiplePayloadStreamElement );
        return offset;
 }
@@ -13901,12 +13951,12 @@ static int dissect_h245_MultiplePayloadStreamElement(tvbuff_t *tvb, int offset,
 
 
 
-static int
-dissect_h245_secondary_REDTME_sequence_of(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree)
-{
 /* XXX */
 static int dissect_h245_RedundancyEncodingDTModeElement(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree);
 
+static int
+dissect_h245_secondary_REDTME_sequence_of(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree)
+{
        offset=dissect_per_sequence_of(tvb, offset, pinfo, tree, hf_h245_secondary_REDTME, ett_h245_secondary_REDTME, dissect_h245_RedundancyEncodingDTModeElement );
        return offset;
 }
@@ -13914,12 +13964,12 @@ static int dissect_h245_RedundancyEncodingDTModeElement(tvbuff_t *tvb, int offse
 
 
 
-static int
-dissect_h245_elements_MPSEM_sequence_of(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree)
-{
 /* XXX*/
 static int dissect_h245_MultiplePayloadStreamElementMode(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree);
 
+static int
+dissect_h245_elements_MPSEM_sequence_of(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree)
+{
        offset=dissect_per_sequence_of(tvb, offset, pinfo, tree, hf_h245_elements_MPSEM, ett_h245_elements_MPSEM, dissect_h245_MultiplePayloadStreamElementMode );
        return offset;
 }
@@ -13961,13 +14011,13 @@ dissect_h245_recoveryReferencePicture_sequence_of(tvbuff_t *tvb, int offset, pac
 
 
 static per_sequence_t ConferenceCapability_sequence[] = {
-       { "nonStandardData", EXTENSION_ROOT, OPTIONAL,
+       { "nonStandardData", ASN1_EXTENSION_ROOT, ASN1_OPTIONAL,
                dissect_h245_nonStandardData_sequence_of },
-       { "chairControlCapability", EXTENSION_ROOT, NOT_OPTIONAL, 
+       { "chairControlCapability", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_chairControlCapability },
-       { "videoIndicateMixingCapability", NOT_EXTENSION_ROOT, NOT_OPTIONAL,
+       { "videoIndicateMixingCapability", ASN1_NOT_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_videoIndicateMixingCapability },
-       { "multipointVisualizationCapability", NOT_EXTENSION_ROOT, OPTIONAL,
+       { "multipointVisualizationCapability", ASN1_NOT_EXTENSION_ROOT, ASN1_OPTIONAL,
                dissect_h245_multipointVisualizationCapability },
        { NULL, 0, 0, NULL }
 };
@@ -13983,17 +14033,17 @@ dissect_h245_ConferenceCapability(tvbuff_t *tvb, int offset, packet_info *pinfo,
 
 
 static per_sequence_t GenericCapability_sequence[] = {
-       { "capabilityIdentifier", EXTENSION_ROOT, NOT_OPTIONAL,
+       { "capabilityIdentifier", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_CapabilityIdentifier },
-       { "maxBitRate", EXTENSION_ROOT, OPTIONAL,
+       { "maxBitRate", ASN1_EXTENSION_ROOT, ASN1_OPTIONAL,
                dissect_h245_maxBitRate_4294967295UL },
-       { "collapsing", EXTENSION_ROOT, OPTIONAL,
+       { "collapsing", ASN1_EXTENSION_ROOT, ASN1_OPTIONAL,
                dissect_h245_collapsing_sequence_of },
-       { "nonCollapsing", EXTENSION_ROOT, OPTIONAL,
+       { "nonCollapsing", ASN1_EXTENSION_ROOT, ASN1_OPTIONAL,
                dissect_h245_nonCollapsing_sequence_of },
-       { "nonCollapsingRaw", EXTENSION_ROOT, OPTIONAL,
+       { "nonCollapsingRaw", ASN1_EXTENSION_ROOT, ASN1_OPTIONAL,
                dissect_h245_nonCollapsingRaw },
-       { "transport", EXTENSION_ROOT, OPTIONAL,
+       { "transport", ASN1_EXTENSION_ROOT, ASN1_OPTIONAL,
                dissect_h245_DataProtocolCapability },
        { NULL, 0, 0, NULL }
 };
@@ -14027,40 +14077,44 @@ static const value_string DataApplicationCapability_application_vals[] = {
        {  0, NULL }
 };
 static per_choice_t DataApplicationCapability_application_choice[] = {
-       {  0, "nonStandard", EXTENSION_ROOT,
+       {  0, "nonStandard", ASN1_EXTENSION_ROOT,
                dissect_h245_NonStandardParameter },
-       {  1, "t120", EXTENSION_ROOT,
+       {  1, "t120", ASN1_EXTENSION_ROOT,
                dissect_h245_DataProtocolCapability },
-       {  2, "dsm-cc", EXTENSION_ROOT,
+       {  2, "dsm-cc", ASN1_EXTENSION_ROOT,
                dissect_h245_DataProtocolCapability },
-       {  3, "userData", EXTENSION_ROOT,
+       {  3, "userData", ASN1_EXTENSION_ROOT,
                dissect_h245_DataProtocolCapability },
-       {  4, "t84", EXTENSION_ROOT,
+       {  4, "t84", ASN1_EXTENSION_ROOT,
                dissect_h245_DataApplicationCapability_application_t84 },
-       {  5, "t434", EXTENSION_ROOT,
+       {  5, "t434", ASN1_EXTENSION_ROOT,
                dissect_h245_DataProtocolCapability },
-       {  6, "h224", EXTENSION_ROOT,
+       {  6, "h224", ASN1_EXTENSION_ROOT,
                dissect_h245_DataProtocolCapability },
-       {  7, "nlpid", EXTENSION_ROOT,
+       {  7, "nlpid", ASN1_EXTENSION_ROOT,
                dissect_h245_DataApplicationCapability_application_nlpid },
-       {  8, "dsvdControl", EXTENSION_ROOT, 
+       {  8, "dsvdControl", ASN1_EXTENSION_ROOT,
                dissect_h245_NULL },
-       {  9, "h222DataPartitioning", EXTENSION_ROOT,
+       {  9, "h222DataPartitioning", ASN1_EXTENSION_ROOT,
                dissect_h245_DataProtocolCapability },
-       { 10, "t30fax", NOT_EXTENSION_ROOT,
+       { 10, "t30fax", ASN1_NOT_EXTENSION_ROOT,
                dissect_h245_DataProtocolCapability },
-       { 11, "t140", NOT_EXTENSION_ROOT,
+       { 11, "t140", ASN1_NOT_EXTENSION_ROOT,
                dissect_h245_DataProtocolCapability },
-       { 12, "t38fax", NOT_EXTENSION_ROOT,
+       { 12, "t38fax", ASN1_NOT_EXTENSION_ROOT,
                dissect_h245_DataApplicationCapability_application_t38fax },
-       { 13, "genericDataCapability", NOT_EXTENSION_ROOT,
+       { 13, "genericDataCapability", ASN1_NOT_EXTENSION_ROOT,
                dissect_h245_GenericCapability },
        {  0, NULL, 0, NULL }
 };
 static int
 dissect_h245_DataApplicationCapability_application(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree)
 {
-       offset=dissect_per_choice(tvb, offset, pinfo, tree, hf_h245_DataApplicationCapability_application, ett_h245_DataApplicationCapability_application, DataApplicationCapability_application_choice, "application", NULL);
+        guint32 value;
+
+       offset=dissect_per_choice(tvb, offset, pinfo, tree, hf_h245_DataApplicationCapability_application, ett_h245_DataApplicationCapability_application, DataApplicationCapability_application_choice, "application", &value);
+
+        codec_type = val_to_str(value, DataApplicationCapability_application_vals, "<unknown>");
 
        return offset;
 }
@@ -14086,33 +14140,33 @@ static const value_string DataMode_application_vals[] = {
        {  0, NULL }
 };
 static per_choice_t DataMode_application_choice[] = {
-       {  0, "nonStandard", EXTENSION_ROOT,
+       {  0, "nonStandard", ASN1_EXTENSION_ROOT,
                dissect_h245_NonStandardParameter },
-       {  1, "t120", EXTENSION_ROOT,
+       {  1, "t120", ASN1_EXTENSION_ROOT,
                dissect_h245_DataProtocolCapability },
-       {  2, "dsm-cc", EXTENSION_ROOT,
+       {  2, "dsm-cc", ASN1_EXTENSION_ROOT,
                dissect_h245_DataProtocolCapability },
-       {  3, "userData", EXTENSION_ROOT,
+       {  3, "userData", ASN1_EXTENSION_ROOT,
                dissect_h245_DataProtocolCapability },
-       {  4, "t84", EXTENSION_ROOT,
+       {  4, "t84", ASN1_EXTENSION_ROOT,
                dissect_h245_DataProtocolCapability },
-       {  5, "t434", EXTENSION_ROOT,
+       {  5, "t434", ASN1_EXTENSION_ROOT,
                dissect_h245_DataProtocolCapability },
-       {  6, "h224", EXTENSION_ROOT,
+       {  6, "h224", ASN1_EXTENSION_ROOT,
                dissect_h245_DataProtocolCapability },
-       {  7, "nlpid", EXTENSION_ROOT,
+       {  7, "nlpid", ASN1_EXTENSION_ROOT,
                dissect_h245_DataMode_application_nlpid },
-       {  8, "dsvdControl", EXTENSION_ROOT, 
+       {  8, "dsvdControl", ASN1_EXTENSION_ROOT,
                dissect_h245_NULL },
-       {  9, "h222DataPartitioning", EXTENSION_ROOT,
+       {  9, "h222DataPartitioning", ASN1_EXTENSION_ROOT,
                dissect_h245_DataProtocolCapability },
-       { 10, "t30fax", NOT_EXTENSION_ROOT, 
+       { 10, "t30fax", ASN1_NOT_EXTENSION_ROOT,
                dissect_h245_DataProtocolCapability },
-       { 11, "t140", NOT_EXTENSION_ROOT,
+       { 11, "t140", ASN1_NOT_EXTENSION_ROOT,
                dissect_h245_DataProtocolCapability },
-       { 12, "t38fax", NOT_EXTENSION_ROOT,
+       { 12, "t38fax", ASN1_NOT_EXTENSION_ROOT,
                dissect_h245_DataMode_application_t38fax },
-       { 13, "genericDataMode", NOT_EXTENSION_ROOT,
+       { 13, "genericDataMode", ASN1_NOT_EXTENSION_ROOT,
                dissect_h245_GenericCapability },
        {  0, NULL, 0, NULL }
 };
@@ -14129,7 +14183,7 @@ dissect_h245_DataMode_application(tvbuff_t *tvb, int offset, packet_info *pinfo,
 
 
 static per_sequence_t MultiplePayloadStream_sequence[] = {
-       { "elements", EXTENSION_ROOT, NOT_OPTIONAL,
+       { "elements", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_elements_MPSE_sequence_of },
        { NULL, 0, 0, NULL }
 };
@@ -14146,7 +14200,7 @@ dissect_h245_MultiplePayloadStream(tvbuff_t *tvb, int offset, packet_info *pinfo
 
 
 static per_sequence_t MultiplePayloadStreamMode_sequence[] = {
-       { "elements", EXTENSION_ROOT, NOT_OPTIONAL,
+       { "elements", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_elements_MPSEM_sequence_of },
        { NULL, 0, 0, NULL }
 };
@@ -14163,9 +14217,9 @@ dissect_h245_MultiplePayloadStreamMode(tvbuff_t *tvb, int offset, packet_info *p
 
 
 static per_sequence_t DataMode_sequence[] = {
-       { "application", EXTENSION_ROOT, NOT_OPTIONAL,
+       { "application", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_DataMode_application },
-       { "bitRate", EXTENSION_ROOT, NOT_OPTIONAL,
+       { "bitRate", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_dataModeBitRate },
        { NULL, 0, 0, NULL }
 };
@@ -14182,7 +14236,7 @@ dissect_h245_DataMode(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree
 
 
 static per_sequence_t RequestAllTerminalIDsResponse_sequence[] = {
-       { "terminalInformation", EXTENSION_ROOT, NOT_OPTIONAL,
+       { "terminalInformation", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_TerminalInformationSO_sequence_of },
        { NULL, 0, 0, NULL }
 };
@@ -14199,9 +14253,9 @@ dissect_h245_RequestAllTerminalIDsResponse(tvbuff_t *tvb, int offset, packet_inf
 
 
 static per_sequence_t DataApplicationCapability_sequence[] = {
-       { "application", EXTENSION_ROOT, NOT_OPTIONAL,
+       { "application", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_DataApplicationCapability_application },
-       { "maxBitRate", EXTENSION_ROOT, NOT_OPTIONAL,
+       { "maxBitRate", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_maxBitRate_4294967295UL },
        { NULL, 0, 0, NULL }
 };
@@ -14227,13 +14281,13 @@ NOT_DECODED_YET("iPSourceRouteAddress");
 
 
 static per_sequence_t UnicastAddress_iPSourceRouteAddress_sequence[] = {
-       { "routing", EXTENSION_ROOT, NOT_OPTIONAL, 
+       { "routing", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_UnicastAddress_iPSourceRouteAddress_routing },
-       { "network", EXTENSION_ROOT, NOT_OPTIONAL,
+       { "network", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_ipv4network },
-       { "tsapIdentifier", EXTENSION_ROOT, NOT_OPTIONAL,
+       { "tsapIdentifier", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_tsapIdentifier },
-       { "route", EXTENSION_ROOT, NOT_OPTIONAL,
+       { "route", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_iPSourceRouteAddress_route },
        { NULL, 0, 0, NULL }
 };
@@ -14258,19 +14312,19 @@ static const value_string UnicastAddress_vals[] = {
        {  0, NULL }
 };
 static per_choice_t UnicastAddress_choice[] = {
-       {  0, "iPAddress", EXTENSION_ROOT,
+       {  0, "iPAddress", ASN1_EXTENSION_ROOT,
                dissect_h245_UnicastAddress_iPAddress },
-       {  1, "iPXAddress", EXTENSION_ROOT,
+       {  1, "iPXAddress", ASN1_EXTENSION_ROOT,
                dissect_h245_UnicastAddress_iPXAddress },
-       {  2, "iP6Address", EXTENSION_ROOT,
+       {  2, "iP6Address", ASN1_EXTENSION_ROOT,
                dissect_h245_UnicastAddress_iP6Address },
-       {  3, "netBios", EXTENSION_ROOT, 
+       {  3, "netBios", ASN1_EXTENSION_ROOT,
                dissect_h245_netBios },
-       {  4, "iPSourceRouteAddress", EXTENSION_ROOT,
+       {  4, "iPSourceRouteAddress", ASN1_EXTENSION_ROOT,
                dissect_h245_UnicastAddress_iPSourceRouteAddress },
-       {  5, "nsap", NOT_EXTENSION_ROOT,
+       {  5, "nsap", ASN1_NOT_EXTENSION_ROOT,
                dissect_h245_nsap },
-       {  6, "nonStandardAddress", NOT_EXTENSION_ROOT,
+       {  6, "nonStandardAddress", ASN1_NOT_EXTENSION_ROOT,
                dissect_h245_NonStandardParameter },
        {  0, NULL, 0, NULL }
 };
@@ -14291,9 +14345,9 @@ static const value_string TransportAddress_vals[] = {
        {  0, NULL }
 };
 static per_choice_t TransportAddress_choice[] = {
-       {  0, "unicastAddress", EXTENSION_ROOT,
+       {  0, "unicastAddress", ASN1_EXTENSION_ROOT,
                dissect_h245_UnicastAddress },
-       {  1, "multicastAddress", EXTENSION_ROOT,
+       {  1, "multicastAddress", ASN1_EXTENSION_ROOT,
                dissect_h245_MulticastAddress },
        {  0, NULL, 0, NULL }
 };
@@ -14307,15 +14361,49 @@ dissect_h245_localAreaAddress(tvbuff_t *tvb, int offset, packet_info *pinfo, pro
 static int
 dissect_h245_mediaChannel(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree)
 {
+       ipv4_address=0;
+       ipv4_port=0;
+
        offset=dissect_per_choice(tvb, offset, pinfo, tree, hf_h245_mediaChannel, ett_h245_TransportAddress, TransportAddress_choice, "mediaChannel", NULL);
 
+       if((!pinfo->fd->flags.visited) && ipv4_address!=0 && ipv4_port!=0 && rtp_handle){
+               address src_addr;
+               conversation_t *conv=NULL;
+
+               src_addr.type=AT_IPv4;
+               src_addr.len=4;
+               src_addr.data=(char *)&ipv4_address;
+
+               conv=find_conversation(&src_addr, &src_addr, PT_UDP, ipv4_port, ipv4_port, NO_ADDR_B|NO_PORT_B);
+               if(!conv){
+                       conv=conversation_new(&src_addr, &src_addr, PT_UDP, ipv4_port, ipv4_port, NO_ADDR2|NO_PORT2);
+                       conversation_set_dissector(conv, rtp_handle);
+               }
+       }
        return offset;
 }
 static int
 dissect_h245_mediaControlChannel(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree)
 {
+       ipv4_address=0;
+       ipv4_port=0;
+
        offset=dissect_per_choice(tvb, offset, pinfo, tree, hf_h245_mediaControlChannel, ett_h245_TransportAddress, TransportAddress_choice, "mediaControlChannel", NULL);
 
+       if((!pinfo->fd->flags.visited) && ipv4_address!=0 && ipv4_port!=0 && rtcp_handle){
+               address src_addr;
+               conversation_t *conv=NULL;
+
+               src_addr.type=AT_IPv4;
+               src_addr.len=4;
+               src_addr.data=(char *)&ipv4_address;
+
+               conv=find_conversation(&src_addr, &src_addr, PT_UDP, ipv4_port, ipv4_port, NO_ADDR_B|NO_PORT_B);
+               if(!conv){
+                       conv=conversation_new(&src_addr, &src_addr, PT_UDP, ipv4_port, ipv4_port, NO_ADDR2|NO_PORT2);
+                       conversation_set_dissector(conv, rtcp_handle);
+               }
+       }
        return offset;
 }
 static int
@@ -14329,7 +14417,7 @@ dissect_h245_signalAddress(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_
 
 
 static per_sequence_t MCLocationIndication_sequence[] = {
-       { "signalAddress", EXTENSION_ROOT, NOT_OPTIONAL,
+       { "signalAddress", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_signalAddress },
        { NULL, 0, 0, NULL }
 };
@@ -14344,19 +14432,19 @@ dissect_h245_MCLocationIndication(tvbuff_t *tvb, int offset, packet_info *pinfo,
 
 
 static per_sequence_t H2250LogicalChannelAckParameters_sequence[] = {
-       { "nonStandard", EXTENSION_ROOT, OPTIONAL,
+       { "nonStandard", ASN1_EXTENSION_ROOT, ASN1_OPTIONAL,
                dissect_h245_nonStandardData_sequence_of },
-       { "sessionID", EXTENSION_ROOT, OPTIONAL,
+       { "sessionID", ASN1_EXTENSION_ROOT, ASN1_OPTIONAL,
                dissect_h245_sessionID_1_255 },
-       { "mediaChannel", EXTENSION_ROOT, OPTIONAL,
+       { "mediaChannel", ASN1_EXTENSION_ROOT, ASN1_OPTIONAL,
                dissect_h245_mediaChannel },
-       { "mediaControlChannel", EXTENSION_ROOT, OPTIONAL,
+       { "mediaControlChannel", ASN1_EXTENSION_ROOT, ASN1_OPTIONAL,
                dissect_h245_mediaControlChannel },
-       { "dynamicRTPPayloadType", EXTENSION_ROOT, OPTIONAL,
+       { "dynamicRTPPayloadType", ASN1_EXTENSION_ROOT, ASN1_OPTIONAL,
                dissect_h245_dynamicRTPPayloadType },
-       { "flowControlToZero", NOT_EXTENSION_ROOT, NOT_OPTIONAL,
+       { "flowControlToZero", ASN1_NOT_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_flowControlToZero },
-       { "portNumber", NOT_EXTENSION_ROOT, OPTIONAL,
+       { "portNumber", ASN1_NOT_EXTENSION_ROOT, ASN1_OPTIONAL,
                dissect_h245_portNumber },
        { NULL, 0, 0, NULL }
 };
@@ -14376,7 +14464,7 @@ static const value_string forwardMultiplexAckParameters_vals[] = {
        {  0, NULL }
 };
 static per_choice_t forwardMultiplexAckParameters_choice[] = {
-       {  0, "h2250LogicalChannelAckParameters", EXTENSION_ROOT,
+       {  0, "h2250LogicalChannelAckParameters", ASN1_EXTENSION_ROOT,
                dissect_h245_H2250LogicalChannelAckParameters },
        {  0, NULL, 0, NULL }
 };
@@ -14405,9 +14493,9 @@ dissect_h245_AlternativeCapabilitySet(tvbuff_t *tvb, int offset, packet_info *pi
 static int dissect_h245_rtpPayloadType_sequence_of(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree);
 
 static per_sequence_t MediaPacketizationCapability_sequence[] = {
-       { "h261aVideoPacketization", EXTENSION_ROOT, NOT_OPTIONAL, 
+       { "h261aVideoPacketization", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_h261aVideoPacketization },
-       { "rtpPayloadType", NOT_EXTENSION_ROOT, OPTIONAL,
+       { "rtpPayloadType", ASN1_NOT_EXTENSION_ROOT, ASN1_OPTIONAL,
                dissect_h245_rtpPayloadType_sequence_of },
        { NULL, 0, 0, NULL }
 };
@@ -14440,11 +14528,11 @@ dissect_h245_mediaChannelCapabilities(tvbuff_t *tvb, int offset, packet_info *pi
 
 
 static per_sequence_t TransportCapability_sequence[] = {
-       { "nonStandard", EXTENSION_ROOT, OPTIONAL,
+       { "nonStandard", ASN1_EXTENSION_ROOT, ASN1_OPTIONAL,
                dissect_h245_NonStandardParameter },
-       { "qOSCapabilities", EXTENSION_ROOT, OPTIONAL,
+       { "qOSCapabilities", ASN1_EXTENSION_ROOT, ASN1_OPTIONAL,
                dissect_h245_qOSCapabilities },
-       { "mediaChannelCapabilities", EXTENSION_ROOT, OPTIONAL, 
+       { "mediaChannelCapabilities", ASN1_EXTENSION_ROOT, ASN1_OPTIONAL,
                dissect_h245_mediaChannelCapabilities },
        { NULL, 0, 0, NULL }
 };
@@ -14476,29 +14564,29 @@ static const value_string MiscellaneousIndication_type_vals[] = {
        {  0, NULL }
 };
 static per_choice_t MiscellaneousIndication_type_choice[] = {
-       {  0, "logicalChannelActive", EXTENSION_ROOT, 
+       {  0, "logicalChannelActive", ASN1_EXTENSION_ROOT,
                        dissect_h245_NULL },
-       {  1, "logicalChannelInactive", EXTENSION_ROOT, 
+       {  1, "logicalChannelInactive", ASN1_EXTENSION_ROOT,
                        dissect_h245_NULL },
-       {  2, "multiportConference", EXTENSION_ROOT, 
+       {  2, "multiportConference", ASN1_EXTENSION_ROOT,
                        dissect_h245_NULL },
-       {  3, "cancelMultiportConference", EXTENSION_ROOT, 
+       {  3, "cancelMultiportConference", ASN1_EXTENSION_ROOT,
                        dissect_h245_NULL },
-       {  4, "multipointZeroComm", EXTENSION_ROOT, 
+       {  4, "multipointZeroComm", ASN1_EXTENSION_ROOT,
                        dissect_h245_NULL },
-       {  5, "cancelMultipointZeroComm", EXTENSION_ROOT, 
+       {  5, "cancelMultipointZeroComm", ASN1_EXTENSION_ROOT,
                        dissect_h245_NULL },
-       {  6, "multipointSecondryStatus", EXTENSION_ROOT, 
+       {  6, "multipointSecondryStatus", ASN1_EXTENSION_ROOT,
                        dissect_h245_NULL },
-       {  7, "cancelMultipointSecondryStatus", EXTENSION_ROOT, 
+       {  7, "cancelMultipointSecondryStatus", ASN1_EXTENSION_ROOT,
                        dissect_h245_NULL },
-       {  8, "videoIndicateReadyToActivate", EXTENSION_ROOT, 
+       {  8, "videoIndicateReadyToActivate", ASN1_EXTENSION_ROOT,
                        dissect_h245_NULL },
-       {  9, "videoTemporalSpatialTradeOff", EXTENSION_ROOT,
+       {  9, "videoTemporalSpatialTradeOff", ASN1_EXTENSION_ROOT,
                        dissect_h245_videoTemporalSpatialTradeOff },
-       { 10, "videoNotDecodedMBs", NOT_EXTENSION_ROOT,
+       { 10, "videoNotDecodedMBs", ASN1_NOT_EXTENSION_ROOT,
                        dissect_h245_MiscellaneousIndication_type_videoNotDecodedMBs },
-       { 11, "transportCapability", NOT_EXTENSION_ROOT,
+       { 11, "transportCapability", ASN1_NOT_EXTENSION_ROOT,
                        dissect_h245_TransportCapability },
        {  0, NULL, 0, NULL }
 };
@@ -14515,9 +14603,9 @@ dissect_h245_MiscellaneousIndication_type(tvbuff_t *tvb, int offset, packet_info
 
 
 static per_sequence_t MiscellaneousIndication_sequence[] = {
-       { "logicalChannelNumber", EXTENSION_ROOT, NOT_OPTIONAL, 
+       { "logicalChannelNumber", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_LogicalChannelNumber },
-       { "type", EXTENSION_ROOT, NOT_OPTIONAL,
+       { "type", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_MiscellaneousIndication_type },
        { NULL, 0, 0, NULL }
 };
@@ -14561,9 +14649,9 @@ static const value_string RTPH263VideoRedundancyEncoding_frameToThreadMapping_va
        {  0, NULL }
 };
 static per_choice_t RTPH263VideoRedundancyEncoding_frameToThreadMapping_choice[] = {
-       {  0, "roundrobin", EXTENSION_ROOT, 
+       {  0, "roundrobin", ASN1_EXTENSION_ROOT,
                dissect_h245_NULL },
-       {  1, "custom", EXTENSION_ROOT,
+       {  1, "custom", ASN1_EXTENSION_ROOT,
                dissect_h245_frameToThreadMapping_custom },
        {  0, NULL, 0, NULL }
 };
@@ -14603,13 +14691,13 @@ dissect_h245_containedThreads(tvbuff_t *tvb, int offset, packet_info *pinfo, pro
 
 
 static per_sequence_t RTPH263VideoRedundancyEncoding_sequence[] = {
-       { "numberOfThreads", EXTENSION_ROOT, NOT_OPTIONAL,
+       { "numberOfThreads", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_numberOfThreads },
-       { "framesBetweenSyncPoints", EXTENSION_ROOT, NOT_OPTIONAL,
+       { "framesBetweenSyncPoints", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_framesBetweenSyncPoints },
-       { "frameToThreadMapping", EXTENSION_ROOT, NOT_OPTIONAL,
+       { "frameToThreadMapping", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_RTPH263VideoRedundancyEncoding_frameToThreadMapping },
-       { "containedThreads", EXTENSION_ROOT, OPTIONAL,
+       { "containedThreads", ASN1_EXTENSION_ROOT, ASN1_OPTIONAL,
                dissect_h245_containedThreads },
        { NULL, 0, 0, NULL }
 };
@@ -14631,11 +14719,11 @@ static const value_string RedundancyEncodingMethod_vals[] = {
        {  0, NULL }
 };
 static per_choice_t RedundancyEncodingMethod_choice[] = {
-       {  0, "nonStandard", EXTENSION_ROOT,
+       {  0, "nonStandard", ASN1_EXTENSION_ROOT,
                dissect_h245_NonStandardParameter },
-       {  1, "rtpAudioRedundancyEncoding", EXTENSION_ROOT, 
+       {  1, "rtpAudioRedundancyEncoding", ASN1_EXTENSION_ROOT,
                dissect_h245_NULL },
-       {  2, "rtpH263VideoRedundancyEncoding", NOT_EXTENSION_ROOT,
+       {  2, "rtpH263VideoRedundancyEncoding", ASN1_NOT_EXTENSION_ROOT,
                dissect_h245_RTPH263VideoRedundancyEncoding },
        {  0, NULL, 0, NULL }
 };
@@ -14651,11 +14739,11 @@ dissect_h245_RedundancyEncodingMethod(tvbuff_t *tvb, int offset, packet_info *pi
 
 
 static per_sequence_t RedundancyEncodingCapability_sequence[] = {
-       { "redundancyEncodingMethod", EXTENSION_ROOT, NOT_OPTIONAL,
+       { "redundancyEncodingMethod", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_RedundancyEncodingMethod },
-       { "primaryEncoding", EXTENSION_ROOT, NOT_OPTIONAL, 
+       { "primaryEncoding", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_CapabilityTableEntryNumber },
-       { "secondaryEncoding", EXTENSION_ROOT, OPTIONAL,
+       { "secondaryEncoding", ASN1_EXTENSION_ROOT, ASN1_OPTIONAL,
                dissect_h245_CapabilityTableEntryNumber_sequence_of },
        { NULL, 0, 0, NULL }
 };
@@ -14702,9 +14790,9 @@ dissect_h245_frameSequence(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_
 
 
 static per_sequence_t RTPH263VideoRedundancyFrameMapping_sequence[] = {
-       { "threadNumber", EXTENSION_ROOT, NOT_OPTIONAL,
+       { "threadNumber", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_threadNumber },
-       { "frameSequence", EXTENSION_ROOT, NOT_OPTIONAL,
+       { "frameSequence", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_frameSequence },
        { NULL, 0, 0, NULL }
 };
@@ -14731,11 +14819,11 @@ dissect_h245_EncryptionCapability(tvbuff_t *tvb, int offset, packet_info *pinfo,
 
 
 static per_sequence_t EncryptionAuthenticationAndIntegrity_sequence[] = {
-       { "encryptionCapability", EXTENSION_ROOT, OPTIONAL,
+       { "encryptionCapability", ASN1_EXTENSION_ROOT, ASN1_OPTIONAL,
                dissect_h245_EncryptionCapability },
-       { "authenticationCapability", EXTENSION_ROOT, OPTIONAL,
+       { "authenticationCapability", ASN1_EXTENSION_ROOT, ASN1_OPTIONAL,
                dissect_h245_AuthenticationCapability },
-       { "integrityCapability", EXTENSION_ROOT, OPTIONAL,
+       { "integrityCapability", ASN1_EXTENSION_ROOT, ASN1_OPTIONAL,
                dissect_h245_IntegrityCapability },
        { NULL, 0, 0, NULL }
 };
@@ -14750,9 +14838,9 @@ dissect_h245_EncryptionAuthenticationAndIntegrity(tvbuff_t *tvb, int offset, pac
 
 
 static per_sequence_t H235SecurityCapability_sequence[] = {
-       { "encryptionAuthenticationAndIntegrity", EXTENSION_ROOT, NOT_OPTIONAL,
+       { "encryptionAuthenticationAndIntegrity", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_EncryptionAuthenticationAndIntegrity },
-       { "mediaCapability", EXTENSION_ROOT, NOT_OPTIONAL, 
+       { "mediaCapability", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_CapabilityTableEntryNumber},
        { NULL, 0, 0, NULL }
 };
@@ -14778,13 +14866,13 @@ dissect_h245_escrowentry(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tr
 
 
 static per_sequence_t EncryptionSync_sequence[] = {
-       { "nonStandard", EXTENSION_ROOT, OPTIONAL,
+       { "nonStandard", ASN1_EXTENSION_ROOT, ASN1_OPTIONAL,
                dissect_h245_NonStandardParameter },
-       { "synchFlag", EXTENSION_ROOT, NOT_OPTIONAL,
+       { "synchFlag", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_synchFlag },
-       { "h235Key", EXTENSION_ROOT, NOT_OPTIONAL,
+       { "h235Key", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_h235Key },
-       { "escrowentry", EXTENSION_ROOT, OPTIONAL,
+       { "escrowentry", ASN1_EXTENSION_ROOT, ASN1_OPTIONAL,
                dissect_h245_escrowentry },
        { NULL, 0, 0, NULL }
 };
@@ -14825,51 +14913,51 @@ static const value_string MiscellaneousCommand_type_vals[] = {
        {  0, NULL }
 };
 static per_choice_t MiscellaneousCommand_type_choice[] = {
-       {  0, "equalizeDelay", EXTENSION_ROOT, 
+       {  0, "equalizeDelay", ASN1_EXTENSION_ROOT,
                dissect_h245_NULL },
-       {  1, "zeroDelay", EXTENSION_ROOT, 
+       {  1, "zeroDelay", ASN1_EXTENSION_ROOT,
                dissect_h245_NULL },
-       {  2, "multipointModeCommand", EXTENSION_ROOT, 
+       {  2, "multipointModeCommand", ASN1_EXTENSION_ROOT,
                dissect_h245_NULL },
-       {  3, "cancelMultipointModeCommand", EXTENSION_ROOT, 
+       {  3, "cancelMultipointModeCommand", ASN1_EXTENSION_ROOT,
                dissect_h245_NULL },
-       {  4, "videoFreezePicture", EXTENSION_ROOT, 
+       {  4, "videoFreezePicture", ASN1_EXTENSION_ROOT,
                dissect_h245_NULL },
-       {  5, "videoFastUpdatePicture", EXTENSION_ROOT, 
+       {  5, "videoFastUpdatePicture", ASN1_EXTENSION_ROOT,
                dissect_h245_NULL },
-       {  6, "videoFastUpdateGOB", EXTENSION_ROOT,
+       {  6, "videoFastUpdateGOB", ASN1_EXTENSION_ROOT,
                dissect_h245_MiscellaneousCommand_type_videoFastUpdateGOB },
-       {  7, "videoTemporalSpatialTradeOff", EXTENSION_ROOT,
+       {  7, "videoTemporalSpatialTradeOff", ASN1_EXTENSION_ROOT,
                dissect_h245_videoTemporalSpatialTradeOff },
-       {  8, "videoSendSyncEveryGOB", EXTENSION_ROOT, 
+       {  8, "videoSendSyncEveryGOB", ASN1_EXTENSION_ROOT,
                dissect_h245_NULL },
-       {  9, "videoSendSyncEveryGOBCancel", EXTENSION_ROOT, 
+       {  9, "videoSendSyncEveryGOBCancel", ASN1_EXTENSION_ROOT,
                dissect_h245_NULL },
-       { 10, "videoFastUpdateMB", NOT_EXTENSION_ROOT,
+       { 10, "videoFastUpdateMB", ASN1_NOT_EXTENSION_ROOT,
                dissect_h245_MiscellaneousCommand_type_videoFastUpdateMB },
-       { 11, "maxH223MUXPDUSize", NOT_EXTENSION_ROOT,
+       { 11, "maxH223MUXPDUSize", ASN1_NOT_EXTENSION_ROOT,
                dissect_h245_maxH223MUXPDUsize },
-       { 12, "encryptionUpdate", NOT_EXTENSION_ROOT,
+       { 12, "encryptionUpdate", ASN1_NOT_EXTENSION_ROOT,
                dissect_h245_EncryptionSync },
-       { 13, "encryptionUpdateRequest", NOT_EXTENSION_ROOT, 
+       { 13, "encryptionUpdateRequest", ASN1_NOT_EXTENSION_ROOT,
                dissect_h245_EncryptionUpdateRequest },
-       { 14, "switchReceiveMediaOff", NOT_EXTENSION_ROOT, 
+       { 14, "switchReceiveMediaOff", ASN1_NOT_EXTENSION_ROOT,
                dissect_h245_NULL },
-       { 15, "switchReceiveMediaOn", NOT_EXTENSION_ROOT, 
+       { 15, "switchReceiveMediaOn", ASN1_NOT_EXTENSION_ROOT,
                dissect_h245_NULL },
-       { 16, "progressiveRefinementStart", NOT_EXTENSION_ROOT, 
+       { 16, "progressiveRefinementStart", ASN1_NOT_EXTENSION_ROOT,
                dissect_h245_MiscellaneousCommand_type_progressiveRefinementStart },
-       { 17, "progressiveRefinementAbortOne", NOT_EXTENSION_ROOT, 
+       { 17, "progressiveRefinementAbortOne", ASN1_NOT_EXTENSION_ROOT,
                dissect_h245_NULL },
-       { 18, "progressiveRefinementAbortContinous", NOT_EXTENSION_ROOT, 
+       { 18, "progressiveRefinementAbortContinous", ASN1_NOT_EXTENSION_ROOT,
                dissect_h245_NULL },
-       { 19, "videoBadMBs", NOT_EXTENSION_ROOT,
+       { 19, "videoBadMBs", ASN1_NOT_EXTENSION_ROOT,
                dissect_h245_MiscellaneousCommand_type_videoBadMBs },
-       { 20, "lostPicture", NOT_EXTENSION_ROOT,
+       { 20, "lostPicture", ASN1_NOT_EXTENSION_ROOT,
                dissect_h245_lostPicture_sequence_of },
-       { 21, "lostPartialPicture", NOT_EXTENSION_ROOT, 
+       { 21, "lostPartialPicture", ASN1_NOT_EXTENSION_ROOT,
                dissect_h245_MiscellaneousCommand_type_lostPartialPicture},
-       { 22, "recoveryReferencePicture", NOT_EXTENSION_ROOT,
+       { 22, "recoveryReferencePicture", ASN1_NOT_EXTENSION_ROOT,
                dissect_h245_recoveryReferencePicture_sequence_of },
        {  0, NULL, 0, NULL }
 };
@@ -14885,9 +14973,9 @@ dissect_h245_MiscellaneousCommand_type(tvbuff_t *tvb, int offset, packet_info *p
 
 
 static per_sequence_t MiscellaneousCommand_sequence[] = {
-       { "logicalChannelNumber", EXTENSION_ROOT, NOT_OPTIONAL, 
+       { "logicalChannelNumber", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_LogicalChannelNumber },
-       { "type", EXTENSION_ROOT, NOT_OPTIONAL,
+       { "type", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_MiscellaneousCommand_type },
        { NULL, 0, 0, NULL }
 };
@@ -14913,9 +15001,9 @@ dissect_h245_elementList(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tr
 
 
 static per_sequence_t MultiplexEntryDescriptor_sequence[] = {
-       { "multiplexTableEntryNumber", NO_EXTENSIONS, NOT_OPTIONAL,
+       { "multiplexTableEntryNumber", ASN1_NO_EXTENSIONS, ASN1_NOT_OPTIONAL,
                dissect_h245_MultiplexTableEntryNumber },
-       { "elementList", NO_EXTENSIONS, OPTIONAL,
+       { "elementList", ASN1_NO_EXTENSIONS, ASN1_OPTIONAL,
                dissect_h245_elementList },
        { NULL, 0, 0, NULL }
 };
@@ -14944,9 +15032,9 @@ static const value_string MultiplexElement_type_vals[] = {
        {  0, NULL }
 };
 static per_choice_t MultiplexElement_type_choice[] = {
-       {  0, "logicalChannelNumber", NO_EXTENSIONS, 
+       {  0, "logicalChannelNumber", ASN1_NO_EXTENSIONS,
                dissect_h245_logicalChannelNumber },
-       {  1, "subElementList", NO_EXTENSIONS,
+       {  1, "subElementList", ASN1_NO_EXTENSIONS,
                dissect_h245_subElementList },
        {  0, NULL, 0, NULL }
 };
@@ -14962,9 +15050,9 @@ dissect_h245_MultiplexElement_type(tvbuff_t *tvb, int offset, packet_info *pinfo
 
 
 static per_sequence_t MultiplexElement_sequence[] = {
-       { "type", NO_EXTENSIONS, NOT_OPTIONAL,
+       { "type", ASN1_NO_EXTENSIONS, ASN1_NOT_OPTIONAL,
                dissect_h245_MultiplexElement_type },
-       { "repeatCount", NO_EXTENSIONS, NOT_OPTIONAL,
+       { "repeatCount", ASN1_NO_EXTENSIONS, ASN1_NOT_OPTIONAL,
                dissect_h245_MultiplexElement_repeatCount },
        { NULL, 0, 0, NULL }
 };
@@ -14992,9 +15080,9 @@ dissect_h245_requestedModes(tvbuff_t *tvb, int offset, packet_info *pinfo, proto
 
 
 static per_sequence_t RequestMode_sequence[] = {
-       { "sequenceNumber", EXTENSION_ROOT, NOT_OPTIONAL, 
+       { "sequenceNumber", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_SequenceNumber },
-       { "requestedModes", EXTENSION_ROOT, NOT_OPTIONAL,
+       { "requestedModes", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_requestedModes },
        { NULL, 0, 0, NULL }
 };
@@ -15018,11 +15106,11 @@ dissect_h245_CertSelectionCriteria(tvbuff_t *tvb, int offset, packet_info *pinfo
 
 
 static per_sequence_t ConferenceRequest_requestTerminalCertificate_sequence[] = {
-       { "terminalLabel", EXTENSION_ROOT, OPTIONAL,
+       { "terminalLabel", ASN1_EXTENSION_ROOT, ASN1_OPTIONAL,
                dissect_h245_TerminalLabel },
-       { "certSelectionCriteria", EXTENSION_ROOT, OPTIONAL,
+       { "certSelectionCriteria", ASN1_EXTENSION_ROOT, ASN1_OPTIONAL,
                dissect_h245_CertSelectionCriteria },
-       { "sRandom", EXTENSION_ROOT, OPTIONAL,
+       { "sRandom", ASN1_EXTENSION_ROOT, ASN1_OPTIONAL,
                dissect_h245_sRandom },
        { NULL, 0, 0, NULL }
 };
@@ -15057,37 +15145,37 @@ static const value_string ConferenceRequest_vals[] = {
        {  0, NULL }
 };
 static per_choice_t ConferenceRequest_choice[] = {
-       {  0, "terminalListRequest", EXTENSION_ROOT, 
+       {  0, "terminalListRequest", ASN1_EXTENSION_ROOT,
                dissect_h245_NULL },
-       {  1, "makeMeChair", EXTENSION_ROOT, 
+       {  1, "makeMeChair", ASN1_EXTENSION_ROOT,
                dissect_h245_NULL },
-       {  2, "cancelMakeMeChair", EXTENSION_ROOT, 
+       {  2, "cancelMakeMeChair", ASN1_EXTENSION_ROOT,
                dissect_h245_NULL },
-       {  3, "dropTerminal", EXTENSION_ROOT, 
+       {  3, "dropTerminal", ASN1_EXTENSION_ROOT,
                dissect_h245_TerminalLabel },
-       {  4, "requestTerminalID", EXTENSION_ROOT, 
+       {  4, "requestTerminalID", ASN1_EXTENSION_ROOT,
                dissect_h245_TerminalLabel },
-       {  5, "enterH243Password", EXTENSION_ROOT, 
+       {  5, "enterH243Password", ASN1_EXTENSION_ROOT,
                dissect_h245_NULL },
-       {  6, "enterH243TerminalID", EXTENSION_ROOT, 
+       {  6, "enterH243TerminalID", ASN1_EXTENSION_ROOT,
                dissect_h245_NULL },
-       {  7, "enterH243ConferenceID", EXTENSION_ROOT, 
+       {  7, "enterH243ConferenceID", ASN1_EXTENSION_ROOT,
                dissect_h245_NULL },
-       {  8, "enterExtensionAddress", NOT_EXTENSION_ROOT, 
+       {  8, "enterExtensionAddress", ASN1_NOT_EXTENSION_ROOT,
                dissect_h245_NULL },
-       {  9, "requestChairTokenOwner", NOT_EXTENSION_ROOT, 
+       {  9, "requestChairTokenOwner", ASN1_NOT_EXTENSION_ROOT,
                dissect_h245_NULL },
-       { 10, "requestTerminalCertificate", NOT_EXTENSION_ROOT,
+       { 10, "requestTerminalCertificate", ASN1_NOT_EXTENSION_ROOT,
                dissect_h245_ConferenceRequest_requestTerminalCertificate },
-       { 11, "broadcastMyLogicalChannel", NOT_EXTENSION_ROOT, 
+       { 11, "broadcastMyLogicalChannel", ASN1_NOT_EXTENSION_ROOT,
                dissect_h245_LogicalChannelNumber },
-       { 12, "makeTerminalBroadcaster", NOT_EXTENSION_ROOT,
+       { 12, "makeTerminalBroadcaster", ASN1_NOT_EXTENSION_ROOT,
                dissect_h245_TerminalLabel },
-       { 13, "sendThisSource", NOT_EXTENSION_ROOT,
+       { 13, "sendThisSource", ASN1_NOT_EXTENSION_ROOT,
                dissect_h245_TerminalLabel },
-       { 14, "requestAllTerminalIDs", NOT_EXTENSION_ROOT, 
+       { 14, "requestAllTerminalIDs", ASN1_NOT_EXTENSION_ROOT,
                dissect_h245_NULL },
-       { 15, "remoteMCRequest", NOT_EXTENSION_ROOT, 
+       { 15, "remoteMCRequest", ASN1_NOT_EXTENSION_ROOT,
                dissect_h245_RemoteMCRequest },
        {  0, NULL, 0, NULL }
 };
@@ -15123,9 +15211,9 @@ dissect_h245_simultaneousCapabilities(tvbuff_t *tvb, int offset, packet_info *pi
 
 
 static per_sequence_t CapabilityDescriptor_sequence[] = {
-       { "capabilityDescriptorNumber", NO_EXTENSIONS, NOT_OPTIONAL, 
+       { "capabilityDescriptorNumber", ASN1_NO_EXTENSIONS, ASN1_NOT_OPTIONAL,
                dissect_h245_CapabilityDescriptorNumber },
-       { "simultaneousCapabilities", NO_EXTENSIONS, OPTIONAL,
+       { "simultaneousCapabilities", ASN1_NO_EXTENSIONS, ASN1_OPTIONAL,
                dissect_h245_simultaneousCapabilities },
        { NULL, 0, 0, NULL }
 };
@@ -15161,25 +15249,25 @@ dissect_h245_gatewayAddress(tvbuff_t *tvb, int offset, packet_info *pinfo, proto
 
 
 static per_sequence_t VCCapability_aal1ViaGateway_sequence[] = {
-       { "gatewayAddress", EXTENSION_ROOT, NOT_OPTIONAL,
+       { "gatewayAddress", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_gatewayAddress },
-       { "nullClockRecovery", EXTENSION_ROOT, NOT_OPTIONAL, 
+       { "nullClockRecovery", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_nullClockRecovery },
-       { "srtsClockRecovery", EXTENSION_ROOT, NOT_OPTIONAL, 
+       { "srtsClockRecovery", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_srtsClockRecovery },
-       { "adaptiveClockRecovery", EXTENSION_ROOT, NOT_OPTIONAL, 
+       { "adaptiveClockRecovery", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_adaptiveClockRecovery },
-       { "nullErrorCorrection", EXTENSION_ROOT, NOT_OPTIONAL, 
+       { "nullErrorCorrection", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_nullErrorCorrection },
-       { "longInterleaver", EXTENSION_ROOT, NOT_OPTIONAL, 
+       { "longInterleaver", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_longInterleaver },
-       { "shortInterleaver", EXTENSION_ROOT, NOT_OPTIONAL, 
+       { "shortInterleaver", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_shortInterleaver },
-       { "errorCorrectionOnly", EXTENSION_ROOT, NOT_OPTIONAL, 
+       { "errorCorrectionOnly", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_errorCorrectionOnly },
-       { "structuredDataTransfer", EXTENSION_ROOT, NOT_OPTIONAL, 
+       { "structuredDataTransfer", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_structuredDataTransfer },
-       { "partiallyFilledCells", EXTENSION_ROOT, NOT_OPTIONAL, 
+       { "partiallyFilledCells", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_partiallyFilledCells },
        { NULL, 0, 0, NULL }
 };
@@ -15194,7 +15282,7 @@ dissect_h245_VCCapability_aal1ViaGateway(tvbuff_t *tvb, int offset, packet_info
 
 
 static per_sequence_t VCCapability_availableBitRates_sequence[] = {
-       { "type", EXTENSION_ROOT, NOT_OPTIONAL,
+       { "type", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_VCCapability_availableBitRates_type },
        { NULL, 0, 0, NULL }
 };
@@ -15211,17 +15299,17 @@ dissect_h245_VCCapability_availableBitRates(tvbuff_t *tvb, int offset, packet_in
 
 
 static per_sequence_t VCCapability_sequence[] = {
-       { "aal1", EXTENSION_ROOT, OPTIONAL, 
+       { "aal1", ASN1_EXTENSION_ROOT, ASN1_OPTIONAL,
                dissect_h245_VCCapability_aal1 },
-       { "aal5", EXTENSION_ROOT, OPTIONAL,
+       { "aal5", ASN1_EXTENSION_ROOT, ASN1_OPTIONAL,
                dissect_h245_VCCapability_aal5 },
-       { "transportStream", EXTENSION_ROOT, NOT_OPTIONAL, 
+       { "transportStream", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_transportStream },
-       { "programStream", EXTENSION_ROOT, NOT_OPTIONAL, 
+       { "programStream", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_programStream },
-       { "availableBitRates", EXTENSION_ROOT, NOT_OPTIONAL,
+       { "availableBitRates", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_VCCapability_availableBitRates },
-       { "aal1ViaGateway", NOT_EXTENSION_ROOT, OPTIONAL,
+       { "aal1ViaGateway", ASN1_NOT_EXTENSION_ROOT, ASN1_OPTIONAL,
                dissect_h245_VCCapability_aal1ViaGateway },
        { NULL, 0, 0, NULL }
 };
@@ -15272,13 +15360,13 @@ dissect_h245_bPictureEnhancement(tvbuff_t *tvb, int offset, packet_info *pinfo,
 
 
 static per_sequence_t EnhancementLayerInfo_sequence[] = {
-       { "baseBitRateConstrained", EXTENSION_ROOT, NOT_OPTIONAL,
+       { "baseBitRateConstrained", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_baseBitRateConstrained },
-       { "snrEnhancement", EXTENSION_ROOT, OPTIONAL,
+       { "snrEnhancement", ASN1_EXTENSION_ROOT, ASN1_OPTIONAL,
                dissect_h245_snrEnhancement },
-       { "spatialEnhancement", EXTENSION_ROOT, OPTIONAL,
+       { "spatialEnhancement", ASN1_EXTENSION_ROOT, ASN1_OPTIONAL,
                dissect_h245_spatialEnhancement },
-       { "bPictureEnhancement", EXTENSION_ROOT, OPTIONAL,
+       { "bPictureEnhancement", ASN1_EXTENSION_ROOT, ASN1_OPTIONAL,
                dissect_h245_bPictureEnhancement },
        { NULL, 0, 0, NULL }
 };
@@ -15329,67 +15417,67 @@ dissect_h245_modeCombos(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tre
 
 
 static per_sequence_t H263Options_sequence[] = {
-       { "advancedIntraCodingMode", EXTENSION_ROOT, NOT_OPTIONAL, 
+       { "advancedIntraCodingMode", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_advancedIntraCodingMode },
-       { "deblockingFilterMode", EXTENSION_ROOT, NOT_OPTIONAL, 
+       { "deblockingFilterMode", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_deblockingFilterMode },
-       { "improvedPBFramesMode", EXTENSION_ROOT, NOT_OPTIONAL, 
+       { "improvedPBFramesMode", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_improvedPBFramesMode },
-       { "unlimitedMotionVectors", EXTENSION_ROOT, NOT_OPTIONAL, 
+       { "unlimitedMotionVectors", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_unlimitedMotionVectors },
-       { "fullPictureFreeze", EXTENSION_ROOT, NOT_OPTIONAL,
+       { "fullPictureFreeze", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_fullPictureFreeze },
-       { "partialPictureFreezeAndRelease", EXTENSION_ROOT, NOT_OPTIONAL, 
+       { "partialPictureFreezeAndRelease", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_partialPictureFreezeAndRelease },
-       { "resizingPartPicFreezeAndRelease", EXTENSION_ROOT, NOT_OPTIONAL,
+       { "resizingPartPicFreezeAndRelease", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_resizingPartPicFreezeAndRelease },
-       { "fullPictureSnapshot", EXTENSION_ROOT, NOT_OPTIONAL,
+       { "fullPictureSnapshot", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_fullPictureSnapshot },
-       { "partialPictureSnapshot", EXTENSION_ROOT, NOT_OPTIONAL, 
+       { "partialPictureSnapshot", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_partialPictureSnapshot },
-       { "videoSegmentTagging", EXTENSION_ROOT, NOT_OPTIONAL,
+       { "videoSegmentTagging", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_videoSegmentTagging },
-       { "progressiveRefinement", EXTENSION_ROOT, NOT_OPTIONAL,
+       { "progressiveRefinement", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_progressiveRefinement },
-       { "dynamicPictureResizingByFour", EXTENSION_ROOT, NOT_OPTIONAL, 
+       { "dynamicPictureResizingByFour", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_dynamicPictureResizingByFour },
-       { "dynamicPictureResizingSixteenthPel", EXTENSION_ROOT, NOT_OPTIONAL,
+       { "dynamicPictureResizingSixteenthPel", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_dynamicPictureResizingSixteenthPel },
-       { "dynamicWarpingHalfPel", EXTENSION_ROOT, NOT_OPTIONAL, 
+       { "dynamicWarpingHalfPel", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_dynamicWarpingHalfPel },
-       { "dynamicWarpingSixteenthPel", EXTENSION_ROOT, NOT_OPTIONAL, 
+       { "dynamicWarpingSixteenthPel", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_dynamicWarpingSixteenthPel },
-       { "independentSegmentDecoding", EXTENSION_ROOT, NOT_OPTIONAL,
+       { "independentSegmentDecoding", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_independentSegmentDecoding },
-       { "slicesInOrder-NonRect", EXTENSION_ROOT, NOT_OPTIONAL, 
+       { "slicesInOrder-NonRect", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_slicesInOrderNonRect },
-       { "slicesInOrder-Rect", EXTENSION_ROOT, NOT_OPTIONAL, 
+       { "slicesInOrder-Rect", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_slicesInOrderRect },
-       { "slicesNoOrder-NonRect", EXTENSION_ROOT, NOT_OPTIONAL,
+       { "slicesNoOrder-NonRect", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_slicesNoOrderNonRect },
-       { "slicesNoOrder-Rect", EXTENSION_ROOT, NOT_OPTIONAL, 
+       { "slicesNoOrder-Rect", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_slicesNoOrderRect },
-       { "alternateInterVLCMode", EXTENSION_ROOT, NOT_OPTIONAL, 
+       { "alternateInterVLCMode", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_alternateInterVLCMode },
-       { "modifiedQuantizationMode", EXTENSION_ROOT, NOT_OPTIONAL,
+       { "modifiedQuantizationMode", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_modifiedQuantizationMode },
-       { "reducedResolutionUpdate", EXTENSION_ROOT, NOT_OPTIONAL, 
+       { "reducedResolutionUpdate", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_reducedResolutionUpdate },
-       { "transparencyParameters", EXTENSION_ROOT, OPTIONAL,
+       { "transparencyParameters", ASN1_EXTENSION_ROOT, ASN1_OPTIONAL,
                dissect_h245_TransperencyParameters },
-       { "separateVideoBackChannel", EXTENSION_ROOT, NOT_OPTIONAL,
+       { "separateVideoBackChannel", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_separateVideoBackChannel },
-       { "refPictureSelection", EXTENSION_ROOT, OPTIONAL,
+       { "refPictureSelection", ASN1_EXTENSION_ROOT, ASN1_OPTIONAL,
                dissect_h245_RefPictureSelection },
-       { "customPictureClockFrequence", EXTENSION_ROOT, OPTIONAL,
+       { "customPictureClockFrequence", ASN1_EXTENSION_ROOT, ASN1_OPTIONAL,
                dissect_h245_customPictureClockFrequency },
-       { "customPictureFormat", EXTENSION_ROOT, OPTIONAL,
+       { "customPictureFormat", ASN1_EXTENSION_ROOT, ASN1_OPTIONAL,
                dissect_h245_customPictureFormat },
-       { "modeCombos", EXTENSION_ROOT, OPTIONAL, 
+       { "modeCombos", ASN1_EXTENSION_ROOT, ASN1_OPTIONAL,
                dissect_h245_modeCombos },
-       { "videoBadMBsCap", NOT_EXTENSION_ROOT, NOT_OPTIONAL, 
+       { "videoBadMBsCap", ASN1_NOT_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_videoBadMBsCap },
-       { "h263Version3Options", NOT_EXTENSION_ROOT, NOT_OPTIONAL, 
+       { "h263Version3Options", ASN1_NOT_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_H263Version3Options },
        { NULL, 0, 0, NULL }
 };
@@ -15405,23 +15493,23 @@ dissect_h245_H263Options(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tr
 
 
 static per_sequence_t H263VideoMode_sequence[] = {
-       { "resolution", EXTENSION_ROOT, NOT_OPTIONAL, 
+       { "resolution", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_H263VideoMode_resolution },
-       { "bitRate", EXTENSION_ROOT, NOT_OPTIONAL,
+       { "bitRate", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_h223bitRate },
-       { "unrestrictedVector", EXTENSION_ROOT, NOT_OPTIONAL, 
+       { "unrestrictedVector", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_unrestrictedVector },
-       { "arithmeticCoding", EXTENSION_ROOT, NOT_OPTIONAL, 
+       { "arithmeticCoding", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_arithmeticCoding },
-       { "advancedPrediction", EXTENSION_ROOT, NOT_OPTIONAL, 
+       { "advancedPrediction", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_advancedPrediction },
-       { "pbFrames", EXTENSION_ROOT, NOT_OPTIONAL, 
+       { "pbFrames", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_pbFrames },
-       { "errorCompensation", NOT_EXTENSION_ROOT, NOT_OPTIONAL, 
+       { "errorCompensation", ASN1_NOT_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_errorCompensation },
-       { "enhancementLayerInfo", NOT_EXTENSION_ROOT, OPTIONAL,
+       { "enhancementLayerInfo", ASN1_NOT_EXTENSION_ROOT, ASN1_OPTIONAL,
                dissect_h245_EnhancementLayerInfo },
-       { "h263Options", NOT_EXTENSION_ROOT, OPTIONAL,
+       { "h263Options", ASN1_NOT_EXTENSION_ROOT, ASN1_OPTIONAL,
                dissect_h245_H263Options },
        { NULL, 0, 0, NULL }
 };
@@ -15438,47 +15526,47 @@ dissect_h245_H263VideoMode(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_
 
 
 static per_sequence_t H263VideoCapability_sequence[] = {
-       { "sqcifMPI", EXTENSION_ROOT, OPTIONAL, 
+       { "sqcifMPI", ASN1_EXTENSION_ROOT, ASN1_OPTIONAL,
                dissect_h245_sqcifMPI_1_32 },
-       { "qcifMPI", EXTENSION_ROOT, OPTIONAL,
+       { "qcifMPI", ASN1_EXTENSION_ROOT, ASN1_OPTIONAL,
                dissect_h245_qcifMPI_1_32 },
-       { "cifMPI", EXTENSION_ROOT, OPTIONAL,
+       { "cifMPI", ASN1_EXTENSION_ROOT, ASN1_OPTIONAL,
                dissect_h245_cifMPI_1_32 },
-       { "cif4MPI", EXTENSION_ROOT, OPTIONAL,
+       { "cif4MPI", ASN1_EXTENSION_ROOT, ASN1_OPTIONAL,
                dissect_h245_cif4MPI_1_32 },
-       { "cif16MPI", EXTENSION_ROOT, OPTIONAL,
+       { "cif16MPI", ASN1_EXTENSION_ROOT, ASN1_OPTIONAL,
                dissect_h245_cif16MPI_1_32 },
-       { "maxBitRate", EXTENSION_ROOT, NOT_OPTIONAL,
+       { "maxBitRate", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_maxBitRate_192400 },
-       { "unrestrictedVector", EXTENSION_ROOT, NOT_OPTIONAL, 
+       { "unrestrictedVector", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_unrestrictedVector },
-       { "arithmeticCoding", EXTENSION_ROOT, NOT_OPTIONAL, 
+       { "arithmeticCoding", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_arithmeticCoding },
-       { "advancedPrediction", EXTENSION_ROOT, NOT_OPTIONAL, 
+       { "advancedPrediction", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_advancedPrediction },
-       { "pbFrames", EXTENSION_ROOT, NOT_OPTIONAL, 
+       { "pbFrames", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_pbFrames },
-       { "temporalSpatialTradeOffCapability", EXTENSION_ROOT, NOT_OPTIONAL,
+       { "temporalSpatialTradeOffCapability", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_temporalSpatialTradeOffCapability },
-       { "hrd-B", EXTENSION_ROOT, OPTIONAL,
+       { "hrd-B", ASN1_EXTENSION_ROOT, ASN1_OPTIONAL,
                dissect_h245_hrd_B },
-       { "bppMaxKb", EXTENSION_ROOT, OPTIONAL,
+       { "bppMaxKb", ASN1_EXTENSION_ROOT, ASN1_OPTIONAL,
                dissect_h245_bppMaxKb },
-       { "slowSqcifMPI", NOT_EXTENSION_ROOT, OPTIONAL, 
+       { "slowSqcifMPI", ASN1_NOT_EXTENSION_ROOT, ASN1_OPTIONAL,
                dissect_h245_slowSqcifMPI },
-       { "slowQcifMPI", NOT_EXTENSION_ROOT, OPTIONAL,
+       { "slowQcifMPI", ASN1_NOT_EXTENSION_ROOT, ASN1_OPTIONAL,
                dissect_h245_slowQcifMPI },
-       { "slowCifMPI", NOT_EXTENSION_ROOT, OPTIONAL,
+       { "slowCifMPI", ASN1_NOT_EXTENSION_ROOT, ASN1_OPTIONAL,
                dissect_h245_slowCifMPI },
-       { "slowCif4MPI", NOT_EXTENSION_ROOT, OPTIONAL,
+       { "slowCif4MPI", ASN1_NOT_EXTENSION_ROOT, ASN1_OPTIONAL,
                dissect_h245_slowCif4MPI },
-       { "slowCif16MPI", NOT_EXTENSION_ROOT, OPTIONAL,
+       { "slowCif16MPI", ASN1_NOT_EXTENSION_ROOT, ASN1_OPTIONAL,
                dissect_h245_slowCif16MPI },
-       { "errorCompensation", NOT_EXTENSION_ROOT, NOT_OPTIONAL, 
+       { "errorCompensation", ASN1_NOT_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_errorCompensation },
-       { "enhancementLayerInfo", NOT_EXTENSION_ROOT, OPTIONAL,
+       { "enhancementLayerInfo", ASN1_NOT_EXTENSION_ROOT, ASN1_OPTIONAL,
                dissect_h245_EnhancementLayerInfo },
-       { "h263Options", NOT_EXTENSION_ROOT, OPTIONAL,
+       { "h263Options", ASN1_NOT_EXTENSION_ROOT, ASN1_OPTIONAL,
                dissect_h245_H263Options },
        { NULL, 0, 0, NULL }
 };
@@ -15504,24 +15592,28 @@ static const value_string VideoCapability_vals[] = {
        {  0, NULL }
 };
 static per_choice_t VideoCapability_choice[] = {
-       {  0, "nonStandard", EXTENSION_ROOT,
+       {  0, "nonStandard", ASN1_EXTENSION_ROOT,
                dissect_h245_NonStandardParameter },
-       {  1, "h261VideoCapability", EXTENSION_ROOT, 
+       {  1, "h261VideoCapability", ASN1_EXTENSION_ROOT,
                dissect_h245_H261VideoCapability },
-       {  2, "h262VideoCapability", EXTENSION_ROOT,
+       {  2, "h262VideoCapability", ASN1_EXTENSION_ROOT,
                dissect_h245_H262VideoCapability },
-       {  3, "h263VideoCapability", EXTENSION_ROOT,
+       {  3, "h263VideoCapability", ASN1_EXTENSION_ROOT,
                dissect_h245_H263VideoCapability },
-       {  4, "is11172VideoCapability", EXTENSION_ROOT,
+       {  4, "is11172VideoCapability", ASN1_EXTENSION_ROOT,
                dissect_h245_IS11172VideoCapability},
-       {  5, "genericVideoCapability", NOT_EXTENSION_ROOT,
+       {  5, "genericVideoCapability", ASN1_NOT_EXTENSION_ROOT,
                dissect_h245_GenericCapability },
        {  0, NULL, 0, NULL }
 };
 static int
 dissect_h245_VideoCapability(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree)
 {
-       offset=dissect_per_choice(tvb, offset, pinfo, tree, hf_h245_VideoCapability, ett_h245_VideoCapability, VideoCapability_choice, "VideoCapability", NULL);
+       guint32 value;
+
+       offset=dissect_per_choice(tvb, offset, pinfo, tree, hf_h245_VideoCapability, ett_h245_VideoCapability, VideoCapability_choice, "VideoCapability", &value );
+
+        codec_type = val_to_str(value, VideoCapability_vals, "<unknown>");
 
        return offset;
 }
@@ -15531,37 +15623,37 @@ dissect_h245_VideoCapability(tvbuff_t *tvb, int offset, packet_info *pinfo, prot
 
 
 static per_sequence_t EnhancementOptions_sequence[] = {
-       { "sqcifMPI", EXTENSION_ROOT, OPTIONAL,
+       { "sqcifMPI", ASN1_EXTENSION_ROOT, ASN1_OPTIONAL,
                dissect_h245_sqcifMPI_1_32 },
-       { "qcifMPI", EXTENSION_ROOT, OPTIONAL,
+       { "qcifMPI", ASN1_EXTENSION_ROOT, ASN1_OPTIONAL,
                dissect_h245_qcifMPI_1_32 },
-       { "cifMPI", EXTENSION_ROOT, OPTIONAL,
+       { "cifMPI", ASN1_EXTENSION_ROOT, ASN1_OPTIONAL,
                dissect_h245_cifMPI_1_32 },
-       { "cif4MPI", EXTENSION_ROOT, OPTIONAL,
+       { "cif4MPI", ASN1_EXTENSION_ROOT, ASN1_OPTIONAL,
                dissect_h245_cif4MPI_1_32 },
-       { "cif16MPI", EXTENSION_ROOT, OPTIONAL,
+       { "cif16MPI", ASN1_EXTENSION_ROOT, ASN1_OPTIONAL,
                dissect_h245_cif16MPI_1_32 },
-       { "maxBitRate", EXTENSION_ROOT, NOT_OPTIONAL,
+       { "maxBitRate", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_maxBitRate_192400 },
-       { "unrestrictedVector", EXTENSION_ROOT, NOT_OPTIONAL, 
+       { "unrestrictedVector", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_unrestrictedVector },
-       { "arithmeticCoding", EXTENSION_ROOT, NOT_OPTIONAL, 
+       { "arithmeticCoding", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_arithmeticCoding },
-       { "temporalSpatialTradeOffCapability", EXTENSION_ROOT, NOT_OPTIONAL,
+       { "temporalSpatialTradeOffCapability", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_temporalSpatialTradeOffCapability },
-       { "slowSqcifMPI", EXTENSION_ROOT, OPTIONAL, 
+       { "slowSqcifMPI", ASN1_EXTENSION_ROOT, ASN1_OPTIONAL,
                dissect_h245_slowSqcifMPI },
-       { "slowQcifMPI", EXTENSION_ROOT, OPTIONAL,
+       { "slowQcifMPI", ASN1_EXTENSION_ROOT, ASN1_OPTIONAL,
                dissect_h245_slowQcifMPI },
-       { "slowCifMPI", EXTENSION_ROOT, OPTIONAL,
+       { "slowCifMPI", ASN1_EXTENSION_ROOT, ASN1_OPTIONAL,
                dissect_h245_slowCifMPI },
-       { "slowCif4MPI", EXTENSION_ROOT, OPTIONAL,
+       { "slowCif4MPI", ASN1_EXTENSION_ROOT, ASN1_OPTIONAL,
                dissect_h245_slowCif4MPI },
-       { "slowCif16MPI", EXTENSION_ROOT, OPTIONAL,
+       { "slowCif16MPI", ASN1_EXTENSION_ROOT, ASN1_OPTIONAL,
                dissect_h245_slowCif16MPI },
-       { "errorCompensation", EXTENSION_ROOT, NOT_OPTIONAL, 
+       { "errorCompensation", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_errorCompensation },
-       { "h263Options", EXTENSION_ROOT, OPTIONAL,
+       { "h263Options", ASN1_EXTENSION_ROOT, ASN1_OPTIONAL,
                dissect_h245_H263Options },
        { NULL, 0, 0, NULL }
 };
@@ -15577,9 +15669,9 @@ dissect_h245_EnhancementOptions(tvbuff_t *tvb, int offset, packet_info *pinfo, p
 
 
 static per_sequence_t BEnhancementParameters_sequence[] = {
-       { "enhancementOptions", EXTENSION_ROOT, NOT_OPTIONAL,
+       { "enhancementOptions", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_EnhancementOptions },
-       { "numberOfBPictures", EXTENSION_ROOT, NOT_OPTIONAL, 
+       { "numberOfBPictures", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_numberOfBPictures },
        { NULL, 0, 0, NULL }
 };
@@ -15606,8 +15698,8 @@ dissect_h245_customPCF(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree
 static int
 dissect_h245_PixelAspectCode(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree)
 {
-       offset=dissect_per_constrained_integer(tvb, offset, pinfo, 
-               tree, hf_h245_PixelAspectCode, 1, 14, 
+       offset=dissect_per_constrained_integer(tvb, offset, pinfo,
+               tree, hf_h245_PixelAspectCode, 1, 14,
                NULL, NULL, FALSE);
 
        return offset;
@@ -15631,11 +15723,11 @@ static const value_string CustomPictureFormat_pixelAspectInformation_vals[] = {
        {  0, NULL }
 };
 static per_choice_t CustomPictureFormat_pixelAspectInformation_choice[] = {
-       {  0, "anyPixelAspectRatio", EXTENSION_ROOT, 
+       {  0, "anyPixelAspectRatio", ASN1_EXTENSION_ROOT,
                dissect_h245_anyPixelAspectRatio },
-       {  1, "pixelAspectCode", EXTENSION_ROOT,
+       {  1, "pixelAspectCode", ASN1_EXTENSION_ROOT,
                dissect_h245_pixelAspectCode },
-       {  2, "extendedPAR", EXTENSION_ROOT,
+       {  2, "extendedPAR", ASN1_EXTENSION_ROOT,
                dissect_h245_extendedPAR },
        {  0, NULL, 0, NULL }
 };
@@ -15652,17 +15744,17 @@ dissect_h245_CustomPictureFormat_pixelAspectInformation(tvbuff_t *tvb, int offse
 
 
 static per_sequence_t CustomPictureFormat_sequence[] = {
-       { "maxCustomPictureWidth", EXTENSION_ROOT, NOT_OPTIONAL,
+       { "maxCustomPictureWidth", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_maxCustomPictureWidth },
-       { "maxCustomPictureHeight", EXTENSION_ROOT, NOT_OPTIONAL,
+       { "maxCustomPictureHeight", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_maxCustomPictureHeight},
-       { "minCustomPictureWidth", EXTENSION_ROOT, NOT_OPTIONAL,
+       { "minCustomPictureWidth", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_minCustomPictureWidth },
-       { "minCustomPictureHeight", EXTENSION_ROOT, NOT_OPTIONAL,
+       { "minCustomPictureHeight", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_minCustomPictureHeight },
-       { "mPI", EXTENSION_ROOT, NOT_OPTIONAL,
+       { "mPI", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_CustomPictureFormat_mPI },
-       { "pixelAspectInformation", EXTENSION_ROOT, NOT_OPTIONAL,
+       { "pixelAspectInformation", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_CustomPictureFormat_pixelAspectInformation },
        { NULL, 0, 0, NULL }
 };
@@ -15699,9 +15791,9 @@ dissect_h245_h263VideoCoupledModes(tvbuff_t *tvb, int offset, packet_info *pinfo
 
 
 static per_sequence_t H263VideoModeCombos_sequence[] = {
-       { "h263VideoUncoupledModes", EXTENSION_ROOT, NOT_OPTIONAL, 
+       { "h263VideoUncoupledModes", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_H263ModeComboFlags },
-       { "h263VideoCoupledModes", EXTENSION_ROOT, NOT_OPTIONAL,
+       { "h263VideoCoupledModes", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_h263VideoCoupledModes },
        { NULL, 0, 0, NULL }
 };
@@ -15735,7 +15827,7 @@ dissect_h245_capabilities(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_t
 
 
 static per_sequence_t MultiplePayloadStreamCapability_sequence[] = {
-       { "capabilities", EXTENSION_ROOT, NOT_OPTIONAL,
+       { "capabilities", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_capabilities },
        { NULL, 0, 0, NULL }
 };
@@ -15761,9 +15853,9 @@ dissect_h245_multiplexEntryDescriptors(tvbuff_t *tvb, int offset, packet_info *p
 
 
 static per_sequence_t MultiplexEntrySend_sequence[] = {
-       { "sequenceNumber", EXTENSION_ROOT, NOT_OPTIONAL, 
+       { "sequenceNumber", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_SequenceNumber },
-       { "multiplexEntryDescriptors", EXTENSION_ROOT, NOT_OPTIONAL,
+       { "multiplexEntryDescriptors", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_multiplexEntryDescriptors },
        { NULL, 0, 0, NULL }
 };
@@ -15788,7 +15880,7 @@ dissect_h245_multiplexTableEntryNumber_set_of(tvbuff_t *tvb, int offset, packet_
 
 
 static per_sequence_t MultiplexEntrySendRelease_sequence[] = {
-       { "multiplexTableEntryNumber", EXTENSION_ROOT, NOT_OPTIONAL,
+       { "multiplexTableEntryNumber", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_multiplexTableEntryNumber_set_of },
        { NULL, 0, 0, NULL }
 };
@@ -15804,9 +15896,9 @@ dissect_h245_MultiplexEntrySendRelease(tvbuff_t *tvb, int offset, packet_info *p
 
 
 static per_sequence_t MultiplexEntrySendAck_sequence[] = {
-       { "sequenceNumber", EXTENSION_ROOT, NOT_OPTIONAL, 
+       { "sequenceNumber", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_SequenceNumber },
-       { "multiplexTableEntryNumber", EXTENSION_ROOT, NOT_OPTIONAL,
+       { "multiplexTableEntryNumber", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_multiplexTableEntryNumber_set_of },
        { NULL, 0, 0, NULL }
 };
@@ -15843,9 +15935,9 @@ dissect_h245_rejectionDescriptions(tvbuff_t *tvb, int offset, packet_info *pinfo
 
 
 static per_sequence_t MultiplexEntrySendReject_sequence[] = {
-       { "sequenceNumber", EXTENSION_ROOT, NOT_OPTIONAL, 
+       { "sequenceNumber", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_SequenceNumber },
-       { "rejectionDescriptions", EXTENSION_ROOT, NOT_OPTIONAL,
+       { "rejectionDescriptions", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_rejectionDescriptions },
        { NULL, 0, 0, NULL }
 };
@@ -15871,7 +15963,7 @@ dissect_h245_entryNumbers(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_t
 
 
 static per_sequence_t RequestMultiplexEntry_sequence[] = {
-       { "entryNumbers", EXTENSION_ROOT, NOT_OPTIONAL,
+       { "entryNumbers", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_entryNumbers },
        { NULL, 0, 0, NULL }
 };
@@ -15886,7 +15978,7 @@ dissect_h245_RequestMultiplexEntry(tvbuff_t *tvb, int offset, packet_info *pinfo
 
 
 static per_sequence_t RequestMultiplexEntryAck_sequence[] = {
-       { "entryNumbers", EXTENSION_ROOT, NOT_OPTIONAL,
+       { "entryNumbers", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_entryNumbers },
        { NULL, 0, 0, NULL }
 };
@@ -15902,9 +15994,9 @@ dissect_h245_RequestMultiplexEntryAck(tvbuff_t *tvb, int offset, packet_info *pi
 
 
 static per_sequence_t RequestMultiplexEntryReject_sequence[] = {
-       { "entryNumbers", EXTENSION_ROOT, NOT_OPTIONAL,
+       { "entryNumbers", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_entryNumbers },
-       { "rejectionDescriptions", EXTENSION_ROOT, NOT_OPTIONAL,
+       { "rejectionDescriptions", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_RMErejectionDescriptions },
        { NULL, 0, 0, NULL }
 };
@@ -15921,7 +16013,7 @@ dissect_h245_RequestMultiplexEntryReject(tvbuff_t *tvb, int offset, packet_info
 
 
 static per_sequence_t RequestMultiplexEntryRelease_sequence[] = {
-       { "entryNumbers", EXTENSION_ROOT, NOT_OPTIONAL,
+       { "entryNumbers", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_entryNumbers },
        { NULL, 0, 0, NULL }
 };
@@ -15961,7 +16053,7 @@ dissect_h245_communicationModeTable(tvbuff_t *tvb, int offset, packet_info *pinf
 
 
 static per_sequence_t CommunicationModeCommand_sequence[] = {
-       { "communicationModeTable", EXTENSION_ROOT, NOT_OPTIONAL,
+       { "communicationModeTable", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_communicationModeTable },
        { NULL, 0, 0, NULL }
 };
@@ -15982,7 +16074,7 @@ static const value_string CommunicationModeResponse_vals[] = {
        {  0, NULL }
 };
 static per_choice_t CommunicationModeResponse_choice[] = {
-       {  0, "communicationModeTable", EXTENSION_ROOT,
+       {  0, "communicationModeTable", ASN1_EXTENSION_ROOT,
                dissect_h245_communicationModeTable },
        {  0, NULL, 0, NULL }
 };
@@ -16028,11 +16120,11 @@ static const value_string DialingInformation_vals[] = {
        {  0, NULL }
 };
 static per_choice_t DialingInformation_choice[] = {
-       {  0, "nonStandard", EXTENSION_ROOT,
+       {  0, "nonStandard", ASN1_EXTENSION_ROOT,
                dissect_h245_NonStandardMessage },
-       {  1, "differential", EXTENSION_ROOT,
+       {  1, "differential", ASN1_EXTENSION_ROOT,
                dissect_h245_differential },
-       {  2, "infoNotAvailable", EXTENSION_ROOT,
+       {  2, "infoNotAvailable", ASN1_EXTENSION_ROOT,
                dissect_h245_infoNotAvailable },
        {  0, NULL, 0, NULL }
 };
@@ -16049,9 +16141,9 @@ dissect_h245_DialingInformation(tvbuff_t *tvb, int offset, packet_info *pinfo, p
 
 
 static per_sequence_t MultilinkResponse_callInformation_sequence[] = {
-       { "dialingInformation", EXTENSION_ROOT, NOT_OPTIONAL,
+       { "dialingInformation", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_DialingInformation },
-       { "callAssociationNumber", EXTENSION_ROOT, NOT_OPTIONAL,
+       { "callAssociationNumber", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_callAssociationNumber },
        { NULL, 0, 0, NULL }
 };
@@ -16077,15 +16169,15 @@ static const value_string MultilinkResponse_vals[] = {
        {  0, NULL }
 };
 static per_choice_t MultilinkResponse_choice[] = {
-       {  0, "nonStandard", EXTENSION_ROOT,
+       {  0, "nonStandard", ASN1_EXTENSION_ROOT,
                dissect_h245_NonStandardMessage },
-       {  1, "callInformation", EXTENSION_ROOT,
+       {  1, "callInformation", ASN1_EXTENSION_ROOT,
                dissect_h245_MultilinkResponse_callInformation },
-       {  2, "addConnection", EXTENSION_ROOT, 
+       {  2, "addConnection", ASN1_EXTENSION_ROOT,
                dissect_h245_MultilinkResponse_addConnection },
-       {  3, "removeConnection", EXTENSION_ROOT,
+       {  3, "removeConnection", ASN1_EXTENSION_ROOT,
                dissect_h245_MultilinkResponse_removeConnection },
-       {  4, "maximumHeaderInterval", EXTENSION_ROOT,
+       {  4, "maximumHeaderInterval", ASN1_EXTENSION_ROOT,
                dissect_h245_MultilinkResponse_maximumHeaderInterval },
        {  0, NULL, 0, NULL }
 };
@@ -16101,9 +16193,9 @@ dissect_h245_MultilinkResponse(tvbuff_t *tvb, int offset, packet_info *pinfo, pr
 
 
 static per_sequence_t MultilinkRequest_addConnection_sequence[] = {
-       { "sequenceNumber", EXTENSION_ROOT, NOT_OPTIONAL, 
+       { "sequenceNumber", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_SequenceNumber },
-       { "dialingInformation", EXTENSION_ROOT, NOT_OPTIONAL,
+       { "dialingInformation", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_DialingInformation },
        { NULL, 0, 0, NULL }
 };
@@ -16128,15 +16220,15 @@ static const value_string MultilinkRequest_vals[] = {
        {  0, NULL }
 };
 static per_choice_t MultilinkRequest_choice[] = {
-       {  0, "nonStandard", EXTENSION_ROOT,
+       {  0, "nonStandard", ASN1_EXTENSION_ROOT,
                dissect_h245_NonStandardMessage },
-       {  1, "callInformation", EXTENSION_ROOT,
+       {  1, "callInformation", ASN1_EXTENSION_ROOT,
                dissect_h245_MultilinkRequest_callInformation },
-       {  2, "addConnection", EXTENSION_ROOT,
+       {  2, "addConnection", ASN1_EXTENSION_ROOT,
                dissect_h245_MultilinkRequest_addConnection },
-       {  3, "removeConnection", EXTENSION_ROOT,
+       {  3, "removeConnection", ASN1_EXTENSION_ROOT,
                dissect_h245_MultilinkRequest_removeConnection },
-       {  4, "maximumHeaderInterval", EXTENSION_ROOT,
+       {  4, "maximumHeaderInterval", ASN1_EXTENSION_ROOT,
                dissect_h245_MultilinkRequest_maximumHeaderInterval },
        {  0, NULL, 0, NULL }
 };
@@ -16184,11 +16276,11 @@ dissect_h245_capabilityDescriptorNumbers(tvbuff_t *tvb, int offset, packet_info
 
 
 static per_sequence_t SendTerminalCapabilitySet_specificRequest_sequence[] = {
-       { "multiplexCapability", EXTENSION_ROOT, NOT_OPTIONAL, 
+       { "multiplexCapability", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_multiplexCapability_bool },
-       { "capabilityTableEntryNumbers", EXTENSION_ROOT, OPTIONAL,
+       { "capabilityTableEntryNumbers", ASN1_EXTENSION_ROOT, ASN1_OPTIONAL,
                dissect_h245_capabilityTableEntryNumbers },
-       { "capabilityDescriptorNumbers", EXTENSION_ROOT, OPTIONAL,
+       { "capabilityDescriptorNumbers", ASN1_EXTENSION_ROOT, ASN1_OPTIONAL,
                dissect_h245_capabilityDescriptorNumbers },
        { NULL, 0, 0, NULL }
 };
@@ -16210,9 +16302,9 @@ static const value_string SendTerminalCapabilitySet_vals[] = {
        {  0, NULL }
 };
 static per_choice_t SendTerminalCapabilitySet_choice[] = {
-       {  0, "specificRequest", EXTENSION_ROOT,
+       {  0, "specificRequest", ASN1_EXTENSION_ROOT,
                dissect_h245_SendTerminalCapabilitySet_specificRequest },
-       {  1, "genericRequest", EXTENSION_ROOT, 
+       {  1, "genericRequest", ASN1_EXTENSION_ROOT,
                dissect_h245_NULL },
        {  0, NULL, 0, NULL }
 };
@@ -16241,9 +16333,9 @@ dissect_h245_audioTelephoneEvent(tvbuff_t *tvb, int offset, packet_info *pinfo,
 
 
 static per_sequence_t AudioTelephonyEventCapability_sequence[] = {
-       { "dynamicRTPPayloadType", EXTENSION_ROOT, NOT_OPTIONAL,
+       { "dynamicRTPPayloadType", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_dynamicRTPPayloadType },
-       { "audioTelephoneEvent", EXTENSION_ROOT, NOT_OPTIONAL,
+       { "audioTelephoneEvent", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_audioTelephoneEvent },
        { NULL, 0, 0, NULL }
 };
@@ -16261,7 +16353,7 @@ dissect_h245_AudioTelephonyEventCapability(tvbuff_t *tvb, int offset, packet_inf
 
 
 static per_sequence_t NoPTAudioTelephonyEventCapability_sequence[] = {
-       { "audioTelephoneEvent", EXTENSION_ROOT, NOT_OPTIONAL,
+       { "audioTelephoneEvent", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_audioTelephoneEvent },
        { NULL, 0, 0, NULL }
 };
@@ -16305,62 +16397,66 @@ static const value_string AudioCapability_vals[] = {
        {  0, NULL }
 };
 static per_choice_t AudioCapability_choice[] = {
-       {  0, "nonStandard", EXTENSION_ROOT,
+       {  0, "nonStandard", ASN1_EXTENSION_ROOT,
                dissect_h245_NonStandardParameter },
-       {  1, "g711Alaw64k", EXTENSION_ROOT,
+       {  1, "g711Alaw64k", ASN1_EXTENSION_ROOT,
                dissect_h245_g711Alaw64k },
-       {  2, "g711Alaw56k", EXTENSION_ROOT,
+       {  2, "g711Alaw56k", ASN1_EXTENSION_ROOT,
                dissect_h245_g711Alaw56k },
-       {  3, "g711Ulaw64k", EXTENSION_ROOT, 
+       {  3, "g711Ulaw64k", ASN1_EXTENSION_ROOT,
                dissect_h245_g711Ulaw64k },
-       {  4, "g711Ulaw56k", EXTENSION_ROOT, 
+       {  4, "g711Ulaw56k", ASN1_EXTENSION_ROOT,
                dissect_h245_g711Ulaw56k },
-       {  5, "g722-64k", EXTENSION_ROOT, 
+       {  5, "g722-64k", ASN1_EXTENSION_ROOT,
                dissect_h245_g722_64k },
-       {  6, "g722-56k", EXTENSION_ROOT,
+       {  6, "g722-56k", ASN1_EXTENSION_ROOT,
                dissect_h245_g722_56k },
-       {  7, "g722-48k", EXTENSION_ROOT,
+       {  7, "g722-48k", ASN1_EXTENSION_ROOT,
                dissect_h245_g722_48k },
-       {  8, "g7231", EXTENSION_ROOT,
+       {  8, "g7231", ASN1_EXTENSION_ROOT,
                dissect_h245_AudioCapability_g7231 },
-       {  9, "g728", EXTENSION_ROOT,
+       {  9, "g728", ASN1_EXTENSION_ROOT,
                dissect_h245_g728 },
-       { 10, "g729", EXTENSION_ROOT,
+       { 10, "g729", ASN1_EXTENSION_ROOT,
                dissect_h245_g729 },
-       { 11, "g729AnnexA", EXTENSION_ROOT,
+       { 11, "g729AnnexA", ASN1_EXTENSION_ROOT,
                dissect_h245_g729AnnexA },
-       { 12, "is11172AudioCapability", EXTENSION_ROOT,
+       { 12, "is11172AudioCapability", ASN1_EXTENSION_ROOT,
                dissect_h245_IS11172AudioCapability },
-       { 13, "is13818AudioCapability", EXTENSION_ROOT,
+       { 13, "is13818AudioCapability", ASN1_EXTENSION_ROOT,
                dissect_h245_IS13818AudioCapability },
-       { 14, "g729wAnnexB", NOT_EXTENSION_ROOT,
+       { 14, "g729wAnnexB", ASN1_NOT_EXTENSION_ROOT,
                dissect_h245_g729wAnnexB },
-       { 15, "g729AnnexAwAnnexB", NOT_EXTENSION_ROOT,
+       { 15, "g729AnnexAwAnnexB", ASN1_NOT_EXTENSION_ROOT,
                dissect_h245_g729AnnexAwAnnexB },
-       { 16, "g7231AnnexCCapability", NOT_EXTENSION_ROOT,
+       { 16, "g7231AnnexCCapability", ASN1_NOT_EXTENSION_ROOT,
                dissect_h245_G7231AnnexCCapability },
-       { 17, "gsmFullRate", NOT_EXTENSION_ROOT,
+       { 17, "gsmFullRate", ASN1_NOT_EXTENSION_ROOT,
                dissect_h245_GSMAudioCapability },
-       { 18, "gsmHalfRate", NOT_EXTENSION_ROOT,
+       { 18, "gsmHalfRate", ASN1_NOT_EXTENSION_ROOT,
                dissect_h245_GSMAudioCapability },
-       { 19, "gsmEnhancedFullRate", NOT_EXTENSION_ROOT,
+       { 19, "gsmEnhancedFullRate", ASN1_NOT_EXTENSION_ROOT,
                dissect_h245_GSMAudioCapability },
-       { 20, "genericAudioCapability", NOT_EXTENSION_ROOT,
+       { 20, "genericAudioCapability", ASN1_NOT_EXTENSION_ROOT,
                dissect_h245_GenericCapability },
-       { 21, "g729Extensions", NOT_EXTENSION_ROOT,
+       { 21, "g729Extensions", ASN1_NOT_EXTENSION_ROOT,
                dissect_h245_G729Extensions },
-       { 22, "vbd", NOT_EXTENSION_ROOT,
+       { 22, "vbd", ASN1_NOT_EXTENSION_ROOT,
                dissect_h245_VBDCapability },
-       { 23, "audioTelephonyEvent", NOT_EXTENSION_ROOT,
+       { 23, "audioTelephonyEvent", ASN1_NOT_EXTENSION_ROOT,
                dissect_h245_NoPTAudioTelephonyEventCapability },
-       { 24, "audioTone", NOT_EXTENSION_ROOT,
+       { 24, "audioTone", ASN1_NOT_EXTENSION_ROOT,
                dissect_h245_NoPTAudioToneCapability },
        {  0, NULL, 0, NULL }
 };
 static int
 dissect_h245_AudioCapability(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree)
 {
-       offset=dissect_per_choice(tvb, offset, pinfo, tree, hf_h245_AudioCapability, ett_h245_AudioCapability, AudioCapability_choice, "AudioCapability", NULL);
+        guint32 value;
+
+       offset=dissect_per_choice(tvb, offset, pinfo, tree, hf_h245_AudioCapability, ett_h245_AudioCapability, AudioCapability_choice, "AudioCapability", &value);
+
+        codec_type = val_to_str(value, AudioCapability_vals, "<unknown>");
 
        return offset;
 }
@@ -16377,13 +16473,13 @@ static const value_string H235Media_mediaType_vals[] = {
        {  0, NULL }
 };
 static per_choice_t H235Media_mediaType_choice[] = {
-       {  0, "nonStandard", EXTENSION_ROOT,
+       {  0, "nonStandard", ASN1_EXTENSION_ROOT,
                dissect_h245_NonStandardParameter },
-       {  1, "videoData", EXTENSION_ROOT,
+       {  1, "videoData", ASN1_EXTENSION_ROOT,
                dissect_h245_VideoCapability },
-       {  2, "audioData", EXTENSION_ROOT,
+       {  2, "audioData", ASN1_EXTENSION_ROOT,
                dissect_h245_AudioCapability },
-       {  3, "data", EXTENSION_ROOT,
+       {  3, "data", ASN1_EXTENSION_ROOT,
                dissect_h245_DataApplicationCapability },
        {  0, NULL, 0, NULL }
 };
@@ -16407,11 +16503,11 @@ static const value_string CommunicationModeTableEntry_dataType_vals[] = {
        {  0, NULL }
 };
 static per_choice_t CommunicationModeTableEntry_dataType_choice[] = {
-       {  0, "videoData", EXTENSION_ROOT,
+       {  0, "videoData", ASN1_EXTENSION_ROOT,
                dissect_h245_VideoCapability },
-       {  1, "audioData", EXTENSION_ROOT,
+       {  1, "audioData", ASN1_EXTENSION_ROOT,
                dissect_h245_AudioCapability },
-       {  2, "data", EXTENSION_ROOT,
+       {  2, "data", ASN1_EXTENSION_ROOT,
                dissect_h245_DataApplicationCapability },
        {  0, NULL, 0, NULL }
 };
@@ -16428,9 +16524,9 @@ dissect_h245_CommunicationModeTableEntry_dataType(tvbuff_t *tvb, int offset, pac
 
 
 static per_sequence_t H235Media_sequence[] = {
-       { "encryptionAuthenticationAndIntegrity", EXTENSION_ROOT, NOT_OPTIONAL,
+       { "encryptionAuthenticationAndIntegrity", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_EncryptionAuthenticationAndIntegrity },
-       { "mediaType", EXTENSION_ROOT, NOT_OPTIONAL,
+       { "mediaType", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_H235Media_mediaType },
        { NULL, 0, 0, NULL }
 };
@@ -16466,13 +16562,13 @@ static const value_string UserInputIndication_userInputSupportIndication_vals[]
        {  0, NULL }
 };
 static per_choice_t UserInputIndication_userInputSupportIndication_choice[] = {
-       {  0, "nonStandard", EXTENSION_ROOT,
+       {  0, "nonStandard", ASN1_EXTENSION_ROOT,
                dissect_h245_NonStandardParameter },
-       {  1, "basicString", EXTENSION_ROOT, 
+       {  1, "basicString", ASN1_EXTENSION_ROOT,
                dissect_h245_NULL },
-       {  2, "iA5String", EXTENSION_ROOT, 
+       {  2, "iA5String", ASN1_EXTENSION_ROOT,
                dissect_h245_NULL },
-       {  3, "generalString", EXTENSION_ROOT, 
+       {  3, "generalString", ASN1_EXTENSION_ROOT,
                dissect_h245_NULL },
        {  0, NULL, 0, NULL }
 };
@@ -16488,9 +16584,9 @@ dissect_h245_UserInputIndication_userInputSupportIndication(tvbuff_t *tvb, int o
 
 
 static per_sequence_t UserInputIndication_extendedAlphanumeric_sequence[] = {
-       { "alphanumeric", EXTENSION_ROOT, NOT_OPTIONAL,
+       { "alphanumeric", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_alphanumeric },
-       { "rtpPayloadIndication", EXTENSION_ROOT, OPTIONAL, 
+       { "rtpPayloadIndication", ASN1_EXTENSION_ROOT, ASN1_OPTIONAL,
                dissect_h245_NULL },
        { NULL, 0, 0, NULL }
 };
@@ -16506,8 +16602,8 @@ dissect_h245_UserInputIndication_extendedAlphanumeric(tvbuff_t *tvb, int offset,
 static int
 dissect_h245_rfcnumber(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree)
 {
-       offset=dissect_per_constrained_integer(tvb, offset, pinfo, 
-               tree, hf_h245_rfc_number, 1, 32768, 
+       offset=dissect_per_constrained_integer(tvb, offset, pinfo,
+               tree, hf_h245_rfc_number, 1, 32768,
                NULL, NULL, TRUE);
        return offset;
 }
@@ -16522,11 +16618,11 @@ static const value_string RTPPayloadType_payloadDescriptor_vals[] = {
        {  0, NULL }
 };
 static per_choice_t RTPPayloadType_payloadDescriptor_choice[] = {
-       {  0, "nonStandardIdentifier", EXTENSION_ROOT,
+       {  0, "nonStandardIdentifier", ASN1_EXTENSION_ROOT,
                dissect_h245_NonStandardParameter },
-       {  1, "rfc-number", EXTENSION_ROOT,
+       {  1, "rfc-number", ASN1_EXTENSION_ROOT,
                dissect_h245_rfcnumber },
-       {  2, "oid", EXTENSION_ROOT,
+       {  2, "oid", ASN1_EXTENSION_ROOT,
                dissect_h245_oid },
        {  0, NULL, 0, NULL }
 };
@@ -16543,9 +16639,9 @@ dissect_h245_RTPPayloadType_payloadDescriptor(tvbuff_t *tvb, int offset, packet_
 
 
 static per_sequence_t RTPPayloadType_sequence[] = {
-       { "payloadDescriptor", EXTENSION_ROOT, NOT_OPTIONAL,
+       { "payloadDescriptor", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_RTPPayloadType_payloadDescriptor },
-       { "payloadType", EXTENSION_ROOT, OPTIONAL,
+       { "payloadType", ASN1_EXTENSION_ROOT, ASN1_OPTIONAL,
                dissect_h245_payloadType },
        { NULL, 0, 0, NULL }
 };
@@ -16568,9 +16664,9 @@ static const value_string H2250LogicalChannelParameters_mediaPacketization_vals[
        {  0, NULL }
 };
 static per_choice_t H2250LogicalChannelParameters_mediaPacketization_choice[] = {
-       {  0, "h261aVideoPacketization", EXTENSION_ROOT, 
+       {  0, "h261aVideoPacketization", ASN1_EXTENSION_ROOT,
                dissect_h245_NULL },
-       {  1, "rtpPayloadType", NOT_EXTENSION_ROOT,
+       {  1, "rtpPayloadType", ASN1_NOT_EXTENSION_ROOT,
                dissect_h245_RTPPayloadType },
        {  0, NULL, 0, NULL }
 };
@@ -16588,11 +16684,11 @@ dissect_h245_H2250LogicalChannelParameters_mediaPacketization(tvbuff_t *tvb, int
 
 static int dissect_h245_mediaDistributionCapability_sequence_of(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree);
 static per_sequence_t MultipointCapability_sequence[] = {
-       { "multicastCapability", EXTENSION_ROOT, NOT_OPTIONAL, 
+       { "multicastCapability", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_multicastCapability },
-       { "multiUniCastConference", EXTENSION_ROOT, NOT_OPTIONAL, 
+       { "multiUniCastConference", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_multiUniCastConference },
-       { "mediaDistributionCapability", EXTENSION_ROOT, NOT_OPTIONAL,
+       { "mediaDistributionCapability", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_mediaDistributionCapability_sequence_of },
        { NULL, 0, 0, NULL }
 };
@@ -16622,27 +16718,27 @@ dissect_h245_receiveAndTransmitMultipointCapability(tvbuff_t *tvb, int offset, p
 
 
 static per_sequence_t H2250Capability_sequence[] = {
-       { "maximumAudioDelayJitter", EXTENSION_ROOT, NOT_OPTIONAL,
+       { "maximumAudioDelayJitter", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_maximumAudioDelayJitter },
-       { "receiveMultipointCapability", EXTENSION_ROOT, NOT_OPTIONAL,
+       { "receiveMultipointCapability", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_receiveMultipointCapability },
-       { "transmitMultipointCapability", EXTENSION_ROOT, NOT_OPTIONAL,
+       { "transmitMultipointCapability", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_transmitMultipointCapability },
-       { "receiveAndTransmitMultipointCapability", EXTENSION_ROOT, NOT_OPTIONAL,
+       { "receiveAndTransmitMultipointCapability", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_receiveAndTransmitMultipointCapability },
-       { "mcCapability", EXTENSION_ROOT, NOT_OPTIONAL, 
+       { "mcCapability", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_H2250Capability_mcCapability },
-       { "rtcpVideoControlCapability", EXTENSION_ROOT, NOT_OPTIONAL, 
+       { "rtcpVideoControlCapability", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_rtcpVideoControlCapability },
-       { "mediaPacketizationCapability", EXTENSION_ROOT, NOT_OPTIONAL, 
+       { "mediaPacketizationCapability", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_MediaPacketizationCapability },
-       { "transportCapability", NOT_EXTENSION_ROOT, OPTIONAL,
+       { "transportCapability", ASN1_NOT_EXTENSION_ROOT, ASN1_OPTIONAL,
                dissect_h245_TransportCapability },
-       { "redundancyEncodingCapability", NOT_EXTENSION_ROOT, OPTIONAL,
+       { "redundancyEncodingCapability", ASN1_NOT_EXTENSION_ROOT, ASN1_OPTIONAL,
                dissect_h245_RedundancyEncodingCapability_sequence_of },
-       { "logicalChannelSwitchingCapability", NOT_EXTENSION_ROOT, NOT_OPTIONAL, 
+       { "logicalChannelSwitchingCapability", ASN1_NOT_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_logicalChannelSwitchingCapability },
-       { "t120DynamicPortCapability", NOT_EXTENSION_ROOT, NOT_OPTIONAL, 
+       { "t120DynamicPortCapability", ASN1_NOT_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_t120DynamicPortCapability },
        { NULL, 0, 0, NULL }
 };
@@ -16661,9 +16757,9 @@ dissect_h245_H2250Capability(tvbuff_t *tvb, int offset, packet_info *pinfo, prot
 
 static int dissect_h245_DataType(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree);
 static per_sequence_t RedundancyEncodingElement_sequence[] = {
-       { "dataType", EXTENSION_ROOT, NOT_OPTIONAL,
+       { "dataType", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_DataType },
-       { "payloadType", EXTENSION_ROOT, OPTIONAL,
+       { "payloadType", ASN1_EXTENSION_ROOT, ASN1_OPTIONAL,
                dissect_h245_payloadType },
        { NULL, 0, 0, NULL }
 };
@@ -16680,9 +16776,9 @@ dissect_h245_RedundancyEncodingElement(tvbuff_t *tvb, int offset, packet_info *p
 
 
 static per_sequence_t RedundancyEncoding_rtpRedundancyEncoding_sequence[] = {
-       { "primary", EXTENSION_ROOT, OPTIONAL,
+       { "primary", ASN1_EXTENSION_ROOT, ASN1_OPTIONAL,
                dissect_h245_RedundancyEncodingElement },
-       { "secondary", EXTENSION_ROOT, OPTIONAL,
+       { "secondary", ASN1_EXTENSION_ROOT, ASN1_OPTIONAL,
                dissect_h245_secondary_REE_sequence_of },
        { NULL, 0, 0, NULL }
 };
@@ -16699,11 +16795,11 @@ dissect_h245_RedundancyEncoding_rtpRedundancyEncoding(tvbuff_t *tvb, int offset,
 
 
 static per_sequence_t RedundancyEncoding_sequence[] = {
-       { "redundancyEncodingMethod", EXTENSION_ROOT, NOT_OPTIONAL,
+       { "redundancyEncodingMethod", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_RedundancyEncodingMethod },
-       { "secondaryEncoding", EXTENSION_ROOT, OPTIONAL,
+       { "secondaryEncoding", ASN1_EXTENSION_ROOT, ASN1_OPTIONAL,
                dissect_h245_DataType },
-       { "rtpRedundancyEncoding", NOT_EXTENSION_ROOT, OPTIONAL,
+       { "rtpRedundancyEncoding", ASN1_NOT_EXTENSION_ROOT, ASN1_OPTIONAL,
                dissect_h245_RedundancyEncoding_rtpRedundancyEncoding },
        { NULL, 0, 0, NULL }
 };
@@ -16719,33 +16815,33 @@ dissect_h245_RedundancyEncoding(tvbuff_t *tvb, int offset, packet_info *pinfo, p
 
 
 static per_sequence_t H2250LogicalChannelParameters_sequence[] = {
-       { "nonStandard", EXTENSION_ROOT, OPTIONAL,
+       { "nonStandard", ASN1_EXTENSION_ROOT, ASN1_OPTIONAL,
                dissect_h245_nonStandardData_sequence_of },
-       { "sessionID", EXTENSION_ROOT, NOT_OPTIONAL,
+       { "sessionID", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_sessionID_0_255 },
-       { "associatedSessionID", EXTENSION_ROOT, OPTIONAL,
+       { "associatedSessionID", ASN1_EXTENSION_ROOT, ASN1_OPTIONAL,
                dissect_h245_associatedSessionID },
-       { "mediaChannel", EXTENSION_ROOT, OPTIONAL,
+       { "mediaChannel", ASN1_EXTENSION_ROOT, ASN1_OPTIONAL,
                dissect_h245_mediaChannel },
-       { "mediaGuaranteedDelivery", EXTENSION_ROOT, OPTIONAL,
+       { "mediaGuaranteedDelivery", ASN1_EXTENSION_ROOT, ASN1_OPTIONAL,
                dissect_h245_mediaGuaranteedDelivery },
-       { "mediaControlChannel", EXTENSION_ROOT, OPTIONAL,
+       { "mediaControlChannel", ASN1_EXTENSION_ROOT, ASN1_OPTIONAL,
                dissect_h245_mediaControlChannel },
-       { "mediaControlGuaranteedDelivery", EXTENSION_ROOT, OPTIONAL,
+       { "mediaControlGuaranteedDelivery", ASN1_EXTENSION_ROOT, ASN1_OPTIONAL,
                dissect_h245_mediaControlGuaranteedDelivery },
-       { "silenceSuppression", EXTENSION_ROOT, OPTIONAL, 
+       { "silenceSuppression", ASN1_EXTENSION_ROOT, ASN1_OPTIONAL,
                dissect_h245_silenceSuppression },
-       { "destination", EXTENSION_ROOT, OPTIONAL,
+       { "destination", ASN1_EXTENSION_ROOT, ASN1_OPTIONAL,
                dissect_h245_TerminalLabel },
-       { "dynamicRTPPayloadType", EXTENSION_ROOT, OPTIONAL,
+       { "dynamicRTPPayloadType", ASN1_EXTENSION_ROOT, ASN1_OPTIONAL,
                dissect_h245_dynamicRTPPayloadType },
-       { "mediaPacketization", EXTENSION_ROOT, OPTIONAL,
+       { "mediaPacketization", ASN1_EXTENSION_ROOT, ASN1_OPTIONAL,
                dissect_h245_H2250LogicalChannelParameters_mediaPacketization },
-       { "transportCapability", NOT_EXTENSION_ROOT, OPTIONAL,
+       { "transportCapability", ASN1_NOT_EXTENSION_ROOT, ASN1_OPTIONAL,
                dissect_h245_TransportCapability },
-       { "redundancyEncoding", NOT_EXTENSION_ROOT, OPTIONAL,
+       { "redundancyEncoding", ASN1_NOT_EXTENSION_ROOT, ASN1_OPTIONAL,
                dissect_h245_RedundancyEncoding },
-       { "source", NOT_EXTENSION_ROOT, OPTIONAL,
+       { "source", ASN1_NOT_EXTENSION_ROOT, ASN1_OPTIONAL,
                dissect_h245_TerminalLabel },
        { NULL, 0, 0, NULL }
 };
@@ -16769,15 +16865,15 @@ static const value_string forwardLogicalChannelParameters_multiplexParameters_va
        {  0, NULL }
 };
 static per_choice_t forwardLogicalChannelParameters_multiplexParameters_choice[] = {
-       {  0, "h222LogicalChannelParameters", EXTENSION_ROOT,
+       {  0, "h222LogicalChannelParameters", ASN1_EXTENSION_ROOT,
                dissect_h245_H222LogicalChannelParameters },
-       {  1, "h223LogicalChannelParameters", EXTENSION_ROOT,
+       {  1, "h223LogicalChannelParameters", ASN1_EXTENSION_ROOT,
                dissect_h245_H223LogicalChannelParameters },
-       {  2, "v76LogicalChannelParameters", EXTENSION_ROOT,
+       {  2, "v76LogicalChannelParameters", ASN1_EXTENSION_ROOT,
                dissect_h245_V76LogicalChannelParameters },
-       {  3, "h2250LogicalChannelParameters", NOT_EXTENSION_ROOT,
+       {  3, "h2250LogicalChannelParameters", ASN1_NOT_EXTENSION_ROOT,
                dissect_h245_H2250LogicalChannelParameters },
-       {  4, "none", NOT_EXTENSION_ROOT, 
+       {  4, "none", ASN1_NOT_EXTENSION_ROOT,
                dissect_h245_NULL },
        {  0, NULL, 0, NULL }
 };
@@ -16794,9 +16890,9 @@ dissect_h245_forwardLogicalChannelParameters_multiplexParameters(tvbuff_t *tvb,
 
 
 static per_sequence_t MultiplePayloadStreamElement_sequence[] = {
-       { "dataType", EXTENSION_ROOT, NOT_OPTIONAL,
+       { "dataType", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_DataType },
-       { "payloadType", EXTENSION_ROOT, OPTIONAL,
+       { "payloadType", ASN1_EXTENSION_ROOT, ASN1_OPTIONAL,
                dissect_h245_payloadType },
        { NULL, 0, 0, NULL }
 };
@@ -16817,11 +16913,11 @@ static const value_string reverseLogicalChannelParameters_multiplexParameters_va
        {  0, NULL }
 };
 static per_choice_t reverseLogicalChannelParameters_multiplexParameters_choice[] = {
-       {  0, "h223LogicalChannelParameters", EXTENSION_ROOT,
+       {  0, "h223LogicalChannelParameters", ASN1_EXTENSION_ROOT,
                dissect_h245_H223LogicalChannelParameters },
-       {  1, "v76LogicalChannelParameters", EXTENSION_ROOT,
+       {  1, "v76LogicalChannelParameters", ASN1_EXTENSION_ROOT,
                dissect_h245_V76LogicalChannelParameters },
-       {  2, "h2250LogicalChannelParameters", NOT_EXTENSION_ROOT,
+       {  2, "h2250LogicalChannelParameters", ASN1_NOT_EXTENSION_ROOT,
                dissect_h245_H2250LogicalChannelParameters },
        {  0, NULL, 0, NULL }
 };
@@ -16842,9 +16938,9 @@ static const value_string OpenLogicalChannelAck_reverseLogicalChannelParameters_
        {  0, NULL }
 };
 static per_choice_t OpenLogicalChannelAck_reverseLogicalChannelParameters_multiplexParameters_choice[] = {
-       {  0, "h222LogicalChannelParameters", EXTENSION_ROOT,
+       {  0, "h222LogicalChannelParameters", ASN1_EXTENSION_ROOT,
                dissect_h245_H222LogicalChannelParameters },
-       {  1, "h2250LogicalChannelParameters", NOT_EXTENSION_ROOT,
+       {  1, "h2250LogicalChannelParameters", ASN1_NOT_EXTENSION_ROOT,
                dissect_h245_H2250LogicalChannelParameters },
        {  0, NULL, 0, NULL }
 };
@@ -16861,15 +16957,15 @@ dissect_h245_OpenLogicalChannelAck_reverseLogicalChannelParameters_multiplexPara
 
 
 static per_sequence_t forwardLogicalChannelParameters_sequence[] = {
-       { "portNumber", EXTENSION_ROOT, OPTIONAL,
+       { "portNumber", ASN1_EXTENSION_ROOT, ASN1_OPTIONAL,
                dissect_h245_portNumber },
-       { "dataType", EXTENSION_ROOT, NOT_OPTIONAL,
+       { "dataType", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_DataType },
-       { "multiplexParameters", EXTENSION_ROOT, NOT_OPTIONAL,
+       { "multiplexParameters", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_forwardLogicalChannelParameters_multiplexParameters },
-       { "forwardLogicalChannelDependency", NOT_EXTENSION_ROOT, OPTIONAL, 
+       { "forwardLogicalChannelDependency", ASN1_NOT_EXTENSION_ROOT, ASN1_OPTIONAL,
                dissect_h245_LogicalChannelNumber },
-       { "replacementFor", NOT_EXTENSION_ROOT, OPTIONAL, 
+       { "replacementFor", ASN1_NOT_EXTENSION_ROOT, ASN1_OPTIONAL,
                dissect_h245_LogicalChannelNumber },
        { NULL, 0, 0, NULL }
 };
@@ -16885,13 +16981,13 @@ dissect_h245_forwardLogicalChannelParameters(tvbuff_t *tvb, int offset, packet_i
 
 
 static per_sequence_t reverseLogicalChannelParameters_sequence[] = {
-       { "dataType", EXTENSION_ROOT, NOT_OPTIONAL,
+       { "dataType", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_DataType },
-       { "multiplexParameters", EXTENSION_ROOT, OPTIONAL,
+       { "multiplexParameters", ASN1_EXTENSION_ROOT, ASN1_OPTIONAL,
                dissect_h245_reverseLogicalChannelParameters_multiplexParameters },
-       { "reverseLogicalChannelDependency", NOT_EXTENSION_ROOT, OPTIONAL, 
+       { "reverseLogicalChannelDependency", ASN1_NOT_EXTENSION_ROOT, ASN1_OPTIONAL,
                dissect_h245_LogicalChannelNumber },
-       { "replacementFor", NOT_EXTENSION_ROOT, OPTIONAL, 
+       { "replacementFor", ASN1_NOT_EXTENSION_ROOT, ASN1_OPTIONAL,
                dissect_h245_LogicalChannelNumber },
        { NULL, 0, 0, NULL }
 };
@@ -16908,13 +17004,13 @@ dissect_h245_reverseLogicalChannelParameters(tvbuff_t *tvb, int offset, packet_i
 
 
 static per_sequence_t OpenLogicalChannelAck_reverseLogicalChannelParameters_sequence[] = {
-       { "reverseLogicalChannelNumber", EXTENSION_ROOT, NOT_OPTIONAL, 
+       { "reverseLogicalChannelNumber", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_LogicalChannelNumber },
-       { "portNumber", EXTENSION_ROOT, OPTIONAL,
+       { "portNumber", ASN1_EXTENSION_ROOT, ASN1_OPTIONAL,
                dissect_h245_portNumber },
-       { "multiplexParameters", EXTENSION_ROOT, OPTIONAL,
+       { "multiplexParameters", ASN1_EXTENSION_ROOT, ASN1_OPTIONAL,
                dissect_h245_OpenLogicalChannelAck_reverseLogicalChannelParameters_multiplexParameters },
-       { "replacementFor", NOT_EXTENSION_ROOT, OPTIONAL, 
+       { "replacementFor", ASN1_NOT_EXTENSION_ROOT, ASN1_OPTIONAL,
                dissect_h245_LogicalChannelNumber },
        { NULL, 0, 0, NULL }
 };
@@ -16940,9 +17036,9 @@ dissect_h245_VCCapability_set_of(tvbuff_t *tvb, int offset, packet_info *pinfo,
 
 
 static per_sequence_t H222Capability_sequence[] = {
-       { "numberOfVCs", EXTENSION_ROOT, NOT_OPTIONAL, 
+       { "numberOfVCs", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_numberOfVCs },
-       { "vcCapability", EXTENSION_ROOT, NOT_OPTIONAL,
+       { "vcCapability", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_VCCapability_set_of },
        { NULL, 0, 0, NULL }
 };
@@ -16964,11 +17060,11 @@ static const value_string MultiplexFormat_vals[] = {
        {  0, NULL }
 };
 static per_choice_t MultiplexFormat_choice[] = {
-       {  0, "nonStandard", EXTENSION_ROOT,
+       {  0, "nonStandard", ASN1_EXTENSION_ROOT,
                dissect_h245_NonStandardParameter },
-       {  1, "h222Capability", EXTENSION_ROOT,
+       {  1, "h222Capability", ASN1_EXTENSION_ROOT,
                dissect_h245_H222Capability },
-       {  2, "h223Capability", EXTENSION_ROOT,
+       {  2, "h223Capability", ASN1_EXTENSION_ROOT,
                dissect_h245_H223Capability },
        {  0, NULL, 0, NULL }
 };
@@ -16984,11 +17080,11 @@ dissect_h245_MultiplexFormat(tvbuff_t *tvb, int offset, packet_info *pinfo, prot
 
 
 static per_sequence_t MultiplexedStreamCapability_sequence[] = {
-       { "multiplexFormat", EXTENSION_ROOT, NOT_OPTIONAL,
+       { "multiplexFormat", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_MultiplexFormat },
-       { "controlOnMuxStream", EXTENSION_ROOT, NOT_OPTIONAL, 
+       { "controlOnMuxStream", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_controlOnMuxStream },
-       { "capabilityOnMuxStream", EXTENSION_ROOT, OPTIONAL,
+       { "capabilityOnMuxStream", ASN1_EXTENSION_ROOT, ASN1_OPTIONAL,
                dissect_h245_capabilityOnMuxStream },
        { NULL, 0, 0, NULL }
 };
@@ -17034,57 +17130,57 @@ static const value_string Capability_vals[] = {
        {  0, NULL }
 };
 static per_choice_t Capability_choice[] = {
-       {  0, "nonStandard", EXTENSION_ROOT,
+       {  0, "nonStandard", ASN1_EXTENSION_ROOT,
                dissect_h245_NonStandardParameter },
-       {  1, "receiveVideoCapability", EXTENSION_ROOT,
+       {  1, "receiveVideoCapability", ASN1_EXTENSION_ROOT,
                dissect_h245_VideoCapability },
-       {  2, "transmitVideoCapability", EXTENSION_ROOT,
+       {  2, "transmitVideoCapability", ASN1_EXTENSION_ROOT,
                dissect_h245_VideoCapability },
-       {  3, "receiveAndTransmitVideoCapability", EXTENSION_ROOT,
+       {  3, "receiveAndTransmitVideoCapability", ASN1_EXTENSION_ROOT,
                dissect_h245_VideoCapability },
-       {  4, "receiveAudioCapability", EXTENSION_ROOT,
+       {  4, "receiveAudioCapability", ASN1_EXTENSION_ROOT,
                dissect_h245_AudioCapability },
-       {  5, "transmitAudioCapability", EXTENSION_ROOT,
+       {  5, "transmitAudioCapability", ASN1_EXTENSION_ROOT,
                dissect_h245_AudioCapability },
-       {  6, "receiveAndTransmitAudioCapability", EXTENSION_ROOT,
+       {  6, "receiveAndTransmitAudioCapability", ASN1_EXTENSION_ROOT,
                dissect_h245_AudioCapability },
-       {  7, "receiveDataApplicationCapability", EXTENSION_ROOT,
+       {  7, "receiveDataApplicationCapability", ASN1_EXTENSION_ROOT,
                dissect_h245_DataApplicationCapability },
-       {  8, "transmitDataApplicationCapability", EXTENSION_ROOT,
+       {  8, "transmitDataApplicationCapability", ASN1_EXTENSION_ROOT,
                dissect_h245_DataApplicationCapability },
-       {  9, "receiveAndTransmitDataApplicationCapability", EXTENSION_ROOT,
+       {  9, "receiveAndTransmitDataApplicationCapability", ASN1_EXTENSION_ROOT,
                dissect_h245_DataApplicationCapability },
-       { 10, "h233EncryptionTransmitCapability", EXTENSION_ROOT, 
+       { 10, "h233EncryptionTransmitCapability", ASN1_EXTENSION_ROOT,
                dissect_h245_h233EncryptionTransmitCapability },
-       { 11, "h233EncryptionReceiveCapability", EXTENSION_ROOT,
+       { 11, "h233EncryptionReceiveCapability", ASN1_EXTENSION_ROOT,
                dissect_h245_Capability_h233EncryptionReceiveCapability },
-       { 12, "conferenceCapability", NOT_EXTENSION_ROOT,
+       { 12, "conferenceCapability", ASN1_NOT_EXTENSION_ROOT,
                dissect_h245_ConferenceCapability },
-       { 13, "h235SecurityCapability" , NOT_EXTENSION_ROOT,
+       { 13, "h235SecurityCapability" , ASN1_NOT_EXTENSION_ROOT,
                dissect_h245_H235SecurityCapability },
-       { 14, "maxPendingReplacementFor", NOT_EXTENSION_ROOT,
+       { 14, "maxPendingReplacementFor", ASN1_NOT_EXTENSION_ROOT,
                dissect_h245_maxPendingReplacementFor },
-       { 15, "receiveUserInputCapability", NOT_EXTENSION_ROOT,
+       { 15, "receiveUserInputCapability", ASN1_NOT_EXTENSION_ROOT,
                dissect_h245_UserInputCapability },
-       { 16, "transmitUserInputCapability", NOT_EXTENSION_ROOT,
+       { 16, "transmitUserInputCapability", ASN1_NOT_EXTENSION_ROOT,
                dissect_h245_UserInputCapability },
-       { 17, "receiveAndTransmitUserInputCapability", NOT_EXTENSION_ROOT,
+       { 17, "receiveAndTransmitUserInputCapability", ASN1_NOT_EXTENSION_ROOT,
                dissect_h245_UserInputCapability },
-       { 18, "genericControlCapability", NOT_EXTENSION_ROOT,
+       { 18, "genericControlCapability", ASN1_NOT_EXTENSION_ROOT,
                dissect_h245_GenericCapability },
-       { 19, "receiveMultiplexedStreamCapability", NOT_EXTENSION_ROOT,
+       { 19, "receiveMultiplexedStreamCapability", ASN1_NOT_EXTENSION_ROOT,
                dissect_h245_MultiplexedStreamCapability },
-       { 20, "transmitMultiplexedStreamCapability", NOT_EXTENSION_ROOT,
+       { 20, "transmitMultiplexedStreamCapability", ASN1_NOT_EXTENSION_ROOT,
                dissect_h245_MultiplexedStreamCapability },
-       { 21, "receiveAndTransmitMultiplexedStreamCapability", NOT_EXTENSION_ROOT,
+       { 21, "receiveAndTransmitMultiplexedStreamCapability", ASN1_NOT_EXTENSION_ROOT,
                dissect_h245_MultiplexedStreamCapability },
-       { 22, "receiveRTPAudioTelephonyEventCapability", NOT_EXTENSION_ROOT,
+       { 22, "receiveRTPAudioTelephonyEventCapability", ASN1_NOT_EXTENSION_ROOT,
                dissect_h245_AudioTelephonyEventCapability },
-       { 23, "receiveRTPAudioToneCapability", NOT_EXTENSION_ROOT,
+       { 23, "receiveRTPAudioToneCapability", ASN1_NOT_EXTENSION_ROOT,
                dissect_h245_AudioToneCapability },
-       { 24, "fecCapability", NOT_EXTENSION_ROOT, 
+       { 24, "fecCapability", ASN1_NOT_EXTENSION_ROOT,
                dissect_h245_FECCapability },
-       { 25, "multiplePayloadStreamCapability", NOT_EXTENSION_ROOT,
+       { 25, "multiplePayloadStreamCapability", ASN1_NOT_EXTENSION_ROOT,
                dissect_h245_MultiplePayloadStreamCapability },
        {  0, NULL, 0, NULL }
 };
@@ -17099,9 +17195,9 @@ dissect_h245_Capability(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tre
 
 
 static per_sequence_t CapabilityTableEntry_sequence[] = {
-       { "capabilityTableEntryNumber", NO_EXTENSIONS, NOT_OPTIONAL,
+       { "capabilityTableEntryNumber", ASN1_NO_EXTENSIONS, ASN1_NOT_OPTIONAL,
                dissect_h245_CapabilityTableEntryNumber },
-       { "capability", NO_EXTENSIONS, OPTIONAL,
+       { "capability", ASN1_NO_EXTENSIONS, ASN1_OPTIONAL,
                dissect_h245_Capability },
        { NULL, 0, 0, NULL }
 };
@@ -17117,9 +17213,9 @@ dissect_h245_CapabilityTableEntry(tvbuff_t *tvb, int offset, packet_info *pinfo,
 
 
 static per_sequence_t MultiplexedStreamParameter_sequence[] = {
-       { "multiplexFormat", EXTENSION_ROOT, NOT_OPTIONAL,
+       { "multiplexFormat", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_MultiplexFormat },
-       { "controlOnMuxStream", EXTENSION_ROOT, NOT_OPTIONAL, 
+       { "controlOnMuxStream", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_controlOnMuxStream },
        { NULL, 0, 0, NULL }
 };
@@ -17151,29 +17247,29 @@ static const value_string DataType_vals[] = {
        {  0, NULL }
 };
 static per_choice_t DataType_choice[] = {
-       {  0, "nonStandard", EXTENSION_ROOT,
+       {  0, "nonStandard", ASN1_EXTENSION_ROOT,
                dissect_h245_NonStandardParameter },
-       {  1, "nullData", EXTENSION_ROOT, 
+       {  1, "nullData", ASN1_EXTENSION_ROOT,
                dissect_h245_NULL },
-       {  2, "videoData", EXTENSION_ROOT,
+       {  2, "videoData", ASN1_EXTENSION_ROOT,
                dissect_h245_VideoCapability },
-       {  3, "audioData", EXTENSION_ROOT,
+       {  3, "audioData", ASN1_EXTENSION_ROOT,
                dissect_h245_AudioCapability },
-       {  4, "data", EXTENSION_ROOT,
+       {  4, "data", ASN1_EXTENSION_ROOT,
                dissect_h245_DataApplicationCapability },
-       {  5, "encryptionData", EXTENSION_ROOT,
+       {  5, "encryptionData", ASN1_EXTENSION_ROOT,
                dissect_h245_EncryptionMode },
-       {  6, "h235Control", NOT_EXTENSION_ROOT,
+       {  6, "h235Control", ASN1_NOT_EXTENSION_ROOT,
                dissect_h245_NonStandardParameter },
-       {  7, "h235Media", NOT_EXTENSION_ROOT,
+       {  7, "h235Media", ASN1_NOT_EXTENSION_ROOT,
                dissect_h245_H235Media },
-       {  8, "multiplexedStream", NOT_EXTENSION_ROOT,
+       {  8, "multiplexedStream", ASN1_NOT_EXTENSION_ROOT,
                dissect_h245_MultiplexedStreamParameter },
-       {  9, "redundancyEncoding", NOT_EXTENSION_ROOT,
+       {  9, "redundancyEncoding", ASN1_NOT_EXTENSION_ROOT,
                dissect_h245_RedundancyEncoding },
-       { 10, "multiplePayloadStream", NOT_EXTENSION_ROOT,
+       { 10, "multiplePayloadStream", ASN1_NOT_EXTENSION_ROOT,
                dissect_h245_MultiplePayloadStream },
-       { 11, "fec", NOT_EXTENSION_ROOT, 
+       { 11, "fec", ASN1_NOT_EXTENSION_ROOT,
                dissect_h245_FECData },
        {  0, NULL, 0, NULL }
 };
@@ -17216,51 +17312,51 @@ static const value_string AudioMode_vals[] = {
        {  0, NULL }
 };
 static per_choice_t AudioMode_choice[] = {
-       {  0, "nonStandard", EXTENSION_ROOT,
+       {  0, "nonStandard", ASN1_EXTENSION_ROOT,
                dissect_h245_NonStandardParameter },
-       {  1, "g711Alaw64k", EXTENSION_ROOT, 
+       {  1, "g711Alaw64k", ASN1_EXTENSION_ROOT,
                dissect_h245_NULL },
-       {  2, "g711Alaw56k", EXTENSION_ROOT, 
+       {  2, "g711Alaw56k", ASN1_EXTENSION_ROOT,
                dissect_h245_NULL },
-       {  3, "g711Ulaw64k", EXTENSION_ROOT, 
+       {  3, "g711Ulaw64k", ASN1_EXTENSION_ROOT,
                dissect_h245_NULL },
-       {  4, "g711Ulaw56k", EXTENSION_ROOT, 
+       {  4, "g711Ulaw56k", ASN1_EXTENSION_ROOT,
                dissect_h245_NULL },
-       {  5, "g722-64k", EXTENSION_ROOT, 
+       {  5, "g722-64k", ASN1_EXTENSION_ROOT,
                dissect_h245_NULL },
-       {  6, "g722-56k", EXTENSION_ROOT, 
+       {  6, "g722-56k", ASN1_EXTENSION_ROOT,
                dissect_h245_NULL },
-       {  7, "g722-48k", EXTENSION_ROOT, 
+       {  7, "g722-48k", ASN1_EXTENSION_ROOT,
                dissect_h245_NULL },
-       {  8, "g728", EXTENSION_ROOT, 
+       {  8, "g728", ASN1_EXTENSION_ROOT,
                dissect_h245_NULL },
-       {  9, "g729", EXTENSION_ROOT, 
+       {  9, "g729", ASN1_EXTENSION_ROOT,
                dissect_h245_NULL },
-       { 10, "g729AnnexA", EXTENSION_ROOT, 
+       { 10, "g729AnnexA", ASN1_EXTENSION_ROOT,
                dissect_h245_NULL },
-       { 11, "g7231", EXTENSION_ROOT, 
+       { 11, "g7231", ASN1_EXTENSION_ROOT,
                dissect_h245_AudioMode_g7231 },
-       { 12, "is11172AudioMode", EXTENSION_ROOT, 
+       { 12, "is11172AudioMode", ASN1_EXTENSION_ROOT,
                dissect_h245_IS11172AudioMode },
-       { 13, "is13818AudioMode", EXTENSION_ROOT, 
+       { 13, "is13818AudioMode", ASN1_EXTENSION_ROOT,
                dissect_h245_IS13818AudioMode },
-       { 14, "g729wAnnexB", NOT_EXTENSION_ROOT,
+       { 14, "g729wAnnexB", ASN1_NOT_EXTENSION_ROOT,
                dissect_h245_g729wAnnexB },
-       { 15, "g729AnnexAwAnnexB", NOT_EXTENSION_ROOT,
+       { 15, "g729AnnexAwAnnexB", ASN1_NOT_EXTENSION_ROOT,
                dissect_h245_g729AnnexAwAnnexB },
-       { 16, "g7231AnnexCMode", NOT_EXTENSION_ROOT,
+       { 16, "g7231AnnexCMode", ASN1_NOT_EXTENSION_ROOT,
                dissect_h245_G7231AnnexCMode },
-       { 17, "gsmFullRate", NOT_EXTENSION_ROOT,
+       { 17, "gsmFullRate", ASN1_NOT_EXTENSION_ROOT,
                dissect_h245_GSMAudioCapability },
-       { 18, "gsmHalfRate", NOT_EXTENSION_ROOT,
+       { 18, "gsmHalfRate", ASN1_NOT_EXTENSION_ROOT,
                dissect_h245_GSMAudioCapability },
-       { 19, "gsmEnhancedFullRate", NOT_EXTENSION_ROOT,
+       { 19, "gsmEnhancedFullRate", ASN1_NOT_EXTENSION_ROOT,
                dissect_h245_GSMAudioCapability },
-       { 20, "genericAudioMode", NOT_EXTENSION_ROOT,
+       { 20, "genericAudioMode", ASN1_NOT_EXTENSION_ROOT,
                dissect_h245_GenericCapability },
-       { 21, "g729Extensions", NOT_EXTENSION_ROOT,
+       { 21, "g729Extensions", ASN1_NOT_EXTENSION_ROOT,
                dissect_h245_G729Extensions },
-       { 22, "vbd", NOT_EXTENSION_ROOT,
+       { 22, "vbd", ASN1_NOT_EXTENSION_ROOT,
                dissect_h245_VBDMode },
        {  0, NULL, 0, NULL }
 };
@@ -17281,9 +17377,9 @@ static const value_string RedundancyEncodingMode_secondaryEncoding_vals[] = {
        {  0, NULL }
 };
 static per_choice_t RedundancyEncodingMode_secondaryEncoding_choice[] = {
-       {  0, "nonStandard", EXTENSION_ROOT,
+       {  0, "nonStandard", ASN1_EXTENSION_ROOT,
                dissect_h245_NonStandardParameter },
-       {  1, "audioData", EXTENSION_ROOT,
+       {  1, "audioData", ASN1_EXTENSION_ROOT,
                dissect_h245_AudioMode },
        {  0, NULL, 0, NULL }
 };
@@ -17298,9 +17394,9 @@ dissect_h245_RedundancyEncodingMode_secondaryEncoding(tvbuff_t *tvb, int offset,
 
 
 static per_sequence_t RedundancyEncodingMode_sequence[] = {
-       { "redundancyEncodingMethod", EXTENSION_ROOT, NOT_OPTIONAL,
+       { "redundancyEncodingMethod", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_RedundancyEncodingMethod },
-       { "secondaryEncoding", EXTENSION_ROOT, OPTIONAL,
+       { "secondaryEncoding", ASN1_EXTENSION_ROOT, ASN1_OPTIONAL,
                dissect_h245_RedundancyEncodingMode_secondaryEncoding },
        { NULL, 0, 0, NULL }
 };
@@ -17315,7 +17411,7 @@ dissect_h245_RedundancyEncodingMode(tvbuff_t *tvb, int offset, packet_info *pinf
 
 
 static per_sequence_t H2250ModeParameters_sequence[] = {
-       { "redundancyEncodingMode", EXTENSION_ROOT, OPTIONAL,
+       { "redundancyEncodingMode", ASN1_EXTENSION_ROOT, ASN1_OPTIONAL,
                dissect_h245_RedundancyEncodingMode },
        { NULL, 0, 0, NULL }
 };
@@ -17332,7 +17428,7 @@ dissect_h245_H2250ModeParameters(tvbuff_t *tvb, int offset, packet_info *pinfo,
 
 
 static per_sequence_t VBDMode_sequence[] = {
-       { "type", EXTENSION_ROOT, NOT_OPTIONAL,
+       { "type", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_AudioMode },
        { NULL, 0, 0, NULL }
 };
@@ -17356,17 +17452,17 @@ static const value_string MultiplexCapability_vals[] = {
        {  0, NULL }
 };
 static per_choice_t MultiplexCapability_choice[] = {
-       {  0, "nonStandard", EXTENSION_ROOT,
+       {  0, "nonStandard", ASN1_EXTENSION_ROOT,
                dissect_h245_NonStandardParameter },
-       {  1, "h222Capability", EXTENSION_ROOT,
+       {  1, "h222Capability", ASN1_EXTENSION_ROOT,
                dissect_h245_H222Capability },
-       {  2, "h223Capability", EXTENSION_ROOT,
+       {  2, "h223Capability", ASN1_EXTENSION_ROOT,
                dissect_h245_H223Capability },
-       {  3, "v76Capability", EXTENSION_ROOT,
+       {  3, "v76Capability", ASN1_EXTENSION_ROOT,
                dissect_h245_V76Capability },
-       {  4, "h2250Capability", NOT_EXTENSION_ROOT,
+       {  4, "h2250Capability", ASN1_NOT_EXTENSION_ROOT,
                dissect_h245_H2250Capability },
-       {  5, "genericMultiplexCapability", NOT_EXTENSION_ROOT,
+       {  5, "genericMultiplexCapability", ASN1_NOT_EXTENSION_ROOT,
                dissect_h245_GenericCapability },
        {  0, NULL, 0, NULL }
 };
@@ -17383,15 +17479,15 @@ dissect_h245_MultiplexCapability(tvbuff_t *tvb, int offset, packet_info *pinfo,
 
 
 static per_sequence_t TerminalCapabilitySet_sequence[] = {
-       { "sequenceNumber", EXTENSION_ROOT, NOT_OPTIONAL, 
+       { "sequenceNumber", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_SequenceNumber },
-       { "protocolIdentifier", EXTENSION_ROOT, NOT_OPTIONAL,
+       { "protocolIdentifier", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_protocolIdentifier },
-       { "multiplexCapability", EXTENSION_ROOT, OPTIONAL,
+       { "multiplexCapability", ASN1_EXTENSION_ROOT, ASN1_OPTIONAL,
                dissect_h245_MultiplexCapability },
-       { "capabilityTable", EXTENSION_ROOT, OPTIONAL,
+       { "capabilityTable", ASN1_EXTENSION_ROOT, ASN1_OPTIONAL,
                dissect_h245_capabilityTable },
-       { "capabilityDescriptors", EXTENSION_ROOT, OPTIONAL,
+       { "capabilityDescriptors", ASN1_EXTENSION_ROOT, ASN1_OPTIONAL,
                dissect_h245_capabilityDescriptors },
        { NULL, 0, 0, NULL }
 };
@@ -17409,9 +17505,9 @@ dissect_h245_TerminalCapabilitySet(tvbuff_t *tvb, int offset, packet_info *pinfo
 
 
 static per_sequence_t ConferenceResponse_terminalIDResponse_sequence[] = {
-       { "terminalLabel", EXTENSION_ROOT, NOT_OPTIONAL,
+       { "terminalLabel", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_TerminalLabel },
-       { "terminalID", EXTENSION_ROOT, NOT_OPTIONAL,
+       { "terminalID", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_TerminalID },
        { NULL, 0, 0, NULL }
 };
@@ -17447,37 +17543,37 @@ static const value_string ConferenceResponse_vals[] = {
        {  0, NULL }
 };
 static per_choice_t ConferenceResponse_choice[] = {
-       {  0, "mCTerminalIDResponse", EXTENSION_ROOT,
+       {  0, "mCTerminalIDResponse", ASN1_EXTENSION_ROOT,
                dissect_h245_ConferenceResponse_mCterminalIDResponse },
-       {  1, "terminalIDResponse", EXTENSION_ROOT,
+       {  1, "terminalIDResponse", ASN1_EXTENSION_ROOT,
                dissect_h245_ConferenceResponse_terminalIDResponse },
-       {  2, "conferenceIDResponse", EXTENSION_ROOT,
+       {  2, "conferenceIDResponse", ASN1_EXTENSION_ROOT,
                dissect_h245_ConferenceResponse_conferenceIDResponse },
-       {  3, "passwordResponse", EXTENSION_ROOT,
+       {  3, "passwordResponse", ASN1_EXTENSION_ROOT,
                dissect_h245_ConferenceResponse_passwordResponse },
-       {  4, "terminalListResponse", EXTENSION_ROOT,
+       {  4, "terminalListResponse", ASN1_EXTENSION_ROOT,
                dissect_h245_terminalListResponse },
-       {  5, "videoCommandReject", EXTENSION_ROOT, 
+       {  5, "videoCommandReject", ASN1_EXTENSION_ROOT,
                dissect_h245_NULL },
-       {  6, "terminalDropReject", EXTENSION_ROOT, 
+       {  6, "terminalDropReject", ASN1_EXTENSION_ROOT,
                dissect_h245_NULL },
-       {  7, "makeMeChairResponse", EXTENSION_ROOT, 
+       {  7, "makeMeChairResponse", ASN1_EXTENSION_ROOT,
                dissect_h245_ConferenceResponse_makeMeChairResponse },
-       {  8, "extensionAddressResponse", NOT_EXTENSION_ROOT,
+       {  8, "extensionAddressResponse", ASN1_NOT_EXTENSION_ROOT,
                dissect_h245_ConferenceResponse_extensionAddressResponse },
-       {  9, "chairTokenOwnerResponse", NOT_EXTENSION_ROOT,
+       {  9, "chairTokenOwnerResponse", ASN1_NOT_EXTENSION_ROOT,
                dissect_h245_ConferenceResponse_chairTokenOwnerResponse },
-       { 10, "terminalCertificateResponse", NOT_EXTENSION_ROOT,
+       { 10, "terminalCertificateResponse", ASN1_NOT_EXTENSION_ROOT,
                dissect_h245_ConferenceResponse_terminalCertificateResponse },
-       { 11, "broadcastMyLogicalChannelResponse", NOT_EXTENSION_ROOT, 
+       { 11, "broadcastMyLogicalChannelResponse", ASN1_NOT_EXTENSION_ROOT,
                dissect_h245_ConferenceResponse_broadcastMyLogicalChannelResponse },
-       { 12, "makeTerminalBroadcasterResponse", NOT_EXTENSION_ROOT, 
+       { 12, "makeTerminalBroadcasterResponse", ASN1_NOT_EXTENSION_ROOT,
                dissect_h245_ConferenceResponse_makeTerminalBroadcasterResponse },
-       { 13, "sendThisSourceResponse", NOT_EXTENSION_ROOT, 
+       { 13, "sendThisSourceResponse", ASN1_NOT_EXTENSION_ROOT,
                dissect_h245_ConferenceResponse_sendThisSourceResponse },
-       { 14, "requestAllTerminalIDsResponse", NOT_EXTENSION_ROOT,
+       { 14, "requestAllTerminalIDsResponse", ASN1_NOT_EXTENSION_ROOT,
                dissect_h245_RequestAllTerminalIDsResponse },
-       { 15, "remoteMCResponse", NOT_EXTENSION_ROOT, 
+       { 15, "remoteMCResponse", ASN1_NOT_EXTENSION_ROOT,
                dissect_h245_RemoteMCResponse },
        {  0, NULL, 0, NULL }
 };
@@ -17499,9 +17595,9 @@ static const value_string H261VideoMode_resolution_vals[] = {
        {  0, NULL }
 };
 static per_choice_t H261VideoMode_resolution_choice[] = {
-       {  0, "qcif", NO_EXTENSIONS,
+       {  0, "qcif", ASN1_NO_EXTENSIONS,
                dissect_h245_NULL },
-       {  1, "cif", NO_EXTENSIONS,
+       {  1, "cif", ASN1_NO_EXTENSIONS,
                dissect_h245_NULL },
        {  0, NULL, 0, NULL }
 };
@@ -17517,11 +17613,11 @@ dissect_h245_H261VideoMode_resolution(tvbuff_t *tvb, int offset, packet_info *pi
 
 
 static per_sequence_t H261VideoMode_sequence[] = {
-       { "resolution", EXTENSION_ROOT, NOT_OPTIONAL,
+       { "resolution", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_H261VideoMode_resolution },
-       { "bitRate", EXTENSION_ROOT, NOT_OPTIONAL,
+       { "bitRate", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_h223bitRate },
-       { "stillImageTransmission", EXTENSION_ROOT, NOT_OPTIONAL, 
+       { "stillImageTransmission", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_stillImageTransmission },
        { NULL, 0, 0, NULL }
 };
@@ -17546,17 +17642,17 @@ static const value_string VideoMode_vals[] = {
        {  0, NULL }
 };
 static per_choice_t VideoMode_choice[] = {
-       {  0, "nonStandard", EXTENSION_ROOT,
+       {  0, "nonStandard", ASN1_EXTENSION_ROOT,
                dissect_h245_NonStandardParameter },
-       {  1, "h261VideoMode", EXTENSION_ROOT,
+       {  1, "h261VideoMode", ASN1_EXTENSION_ROOT,
                dissect_h245_H261VideoMode },
-       {  2, "h262VideoMode", EXTENSION_ROOT,
+       {  2, "h262VideoMode", ASN1_EXTENSION_ROOT,
                dissect_h245_H262VideoMode },
-       {  3, "h263VideoMode", EXTENSION_ROOT,
+       {  3, "h263VideoMode", ASN1_EXTENSION_ROOT,
                dissect_h245_H263VideoMode },
-       {  4, "is11172VideoMode", EXTENSION_ROOT, 
+       {  4, "is11172VideoMode", ASN1_EXTENSION_ROOT,
                dissect_h245_IS11172VideoMode},
-       {  5, "genericVideoMode", NOT_EXTENSION_ROOT,
+       {  5, "genericVideoMode", ASN1_NOT_EXTENSION_ROOT,
                dissect_h245_GenericCapability },
        {  0, NULL, 0, NULL }
 };
@@ -17579,13 +17675,13 @@ static const value_string H235Mode_mediaMode_vals[] = {
        {  0, NULL }
 };
 static per_choice_t H235Mode_mediaMode_choice[] = {
-       {  0, "nonStandard", EXTENSION_ROOT,
+       {  0, "nonStandard", ASN1_EXTENSION_ROOT,
                dissect_h245_NonStandardParameter },
-       {  1, "videoMode", EXTENSION_ROOT,
+       {  1, "videoMode", ASN1_EXTENSION_ROOT,
                dissect_h245_VideoMode },
-       {  2, "audioMode", EXTENSION_ROOT,
+       {  2, "audioMode", ASN1_EXTENSION_ROOT,
                dissect_h245_AudioMode },
-       {  3, "dataMode", EXTENSION_ROOT,
+       {  3, "dataMode", ASN1_EXTENSION_ROOT,
                dissect_h245_DataMode },
        {  0, NULL, 0, NULL }
 };
@@ -17601,9 +17697,9 @@ dissect_h245_H235Mode_mediaMode(tvbuff_t *tvb, int offset, packet_info *pinfo, p
 
 
 static per_sequence_t H235Mode_sequence[] = {
-       { "encryptionAuthenticationAndIntegrity", EXTENSION_ROOT, NOT_OPTIONAL,
+       { "encryptionAuthenticationAndIntegrity", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_EncryptionAuthenticationAndIntegrity },
-       { "mediaMode", EXTENSION_ROOT, NOT_OPTIONAL,
+       { "mediaMode", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_H235Mode_mediaMode },
        { NULL, 0, 0, NULL }
 };
@@ -17629,17 +17725,17 @@ static const value_string RedundancyEncodingDTModeElement_type_vals[] = {
        {  0, NULL }
 };
 static per_choice_t RedundancyEncodingDTModeElement_type_choice[] = {
-       {  0, "nonStandard", EXTENSION_ROOT,
+       {  0, "nonStandard", ASN1_EXTENSION_ROOT,
                dissect_h245_NonStandardParameter },
-       {  1, "videoMode", EXTENSION_ROOT,
+       {  1, "videoMode", ASN1_EXTENSION_ROOT,
                dissect_h245_VideoMode },
-       {  2, "audioMode", EXTENSION_ROOT,
+       {  2, "audioMode", ASN1_EXTENSION_ROOT,
                dissect_h245_AudioMode },
-       {  3, "dataMode", EXTENSION_ROOT, 
+       {  3, "dataMode", ASN1_EXTENSION_ROOT,
                dissect_h245_DataMode },
-       {  4, "encryptionMode", EXTENSION_ROOT,
+       {  4, "encryptionMode", ASN1_EXTENSION_ROOT,
                dissect_h245_EncryptionMode },
-       {  5, "h235Mode", EXTENSION_ROOT,
+       {  5, "h235Mode", ASN1_EXTENSION_ROOT,
                dissect_h245_H235Mode },
        {  0, NULL, 0, NULL }
 };
@@ -17655,7 +17751,7 @@ dissect_h245_RedundancyEncodingDTModeElement_type(tvbuff_t *tvb, int offset, pac
 
 
 static per_sequence_t RedundancyEncodingDTModeElement_sequence[] = {
-       { "type", EXTENSION_ROOT, NOT_OPTIONAL,
+       { "type", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_RedundancyEncodingDTModeElement_type },
        { NULL, 0, 0, NULL }
 };
@@ -17672,11 +17768,11 @@ dissect_h245_RedundancyEncodingDTModeElement(tvbuff_t *tvb, int offset, packet_i
 
 
 static per_sequence_t RedundancyEncodingDTMode_sequence[] = {
-       { "redundancyEncodingMethod", EXTENSION_ROOT, NOT_OPTIONAL,
+       { "redundancyEncodingMethod", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_RedundancyEncodingMethod },
-       { "primary", EXTENSION_ROOT, NOT_OPTIONAL,
+       { "primary", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_RedundancyEncodingDTModeElement },
-       { "secondary", EXTENSION_ROOT, NOT_OPTIONAL,
+       { "secondary", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_secondary_REDTME_sequence_of },
        { NULL, 0, 0, NULL }
 };
@@ -17706,25 +17802,25 @@ static const value_string ModeElementType_vals[] = {
        {  0, NULL }
 };
 static per_choice_t ModeElementType_choice[] = {
-       {  0, "nonStandard", EXTENSION_ROOT,
+       {  0, "nonStandard", ASN1_EXTENSION_ROOT,
                dissect_h245_NonStandardParameter },
-       {  1, "videoMode", EXTENSION_ROOT,
+       {  1, "videoMode", ASN1_EXTENSION_ROOT,
                dissect_h245_VideoMode },
-       {  2, "audioMode", EXTENSION_ROOT,
+       {  2, "audioMode", ASN1_EXTENSION_ROOT,
                dissect_h245_AudioMode },
-       {  3, "dataMode", EXTENSION_ROOT,
+       {  3, "dataMode", ASN1_EXTENSION_ROOT,
                dissect_h245_DataMode },
-       {  4, "encryptionMode", EXTENSION_ROOT,
+       {  4, "encryptionMode", ASN1_EXTENSION_ROOT,
                dissect_h245_EncryptionMode },
-       {  5, "h235Mode", NOT_EXTENSION_ROOT,
+       {  5, "h235Mode", ASN1_NOT_EXTENSION_ROOT,
                dissect_h245_H235Mode },
-       {  6, "multiplexedStreamMode", NOT_EXTENSION_ROOT,
+       {  6, "multiplexedStreamMode", ASN1_NOT_EXTENSION_ROOT,
                dissect_h245_MultiplexedStreamParameter },
-       {  7, "redundancyEncodingDTMode", NOT_EXTENSION_ROOT,
+       {  7, "redundancyEncodingDTMode", ASN1_NOT_EXTENSION_ROOT,
                dissect_h245_RedundancyEncodingDTMode },
-       {  8, "multiplePayloadStreamMode", NOT_EXTENSION_ROOT,
+       {  8, "multiplePayloadStreamMode", ASN1_NOT_EXTENSION_ROOT,
                dissect_h245_MultiplePayloadStreamMode },
-       {  9, "fecMode", NOT_EXTENSION_ROOT,
+       {  9, "fecMode", ASN1_NOT_EXTENSION_ROOT,
                dissect_h245_FECMode },
        {  0, NULL, 0, NULL }
 };
@@ -17740,7 +17836,7 @@ dissect_h245_ModeElementType(tvbuff_t *tvb, int offset, packet_info *pinfo, prot
 
 
 static per_sequence_t MultiplePayloadStreamElementMode_sequence[] = {
-       { "type", EXTENSION_ROOT, NOT_OPTIONAL,
+       { "type", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_ModeElementType },
        { NULL, 0, 0, NULL }
 };
@@ -17757,7 +17853,7 @@ dissect_h245_MultiplePayloadStreamElementMode(tvbuff_t *tvb, int offset, packet_
 
 
 static per_sequence_t FECMode_rfc2733Mode_mode_separateStream_samePort_sequence[] = {
-       { "protectedType", EXTENSION_ROOT, NOT_OPTIONAL,
+       { "protectedType", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_ModeElementType },
        { NULL, 0, 0, NULL }
 };
@@ -17777,9 +17873,9 @@ static const value_string FECMode_rfc2733Mode_mode_separateStream_vals[] = {
        {  0, NULL }
 };
 static per_choice_t FECMode_rfc2733Mode_mode_separateStream_choice[] = {
-       {  0, "differentPort", EXTENSION_ROOT,
+       {  0, "differentPort", ASN1_EXTENSION_ROOT,
                dissect_h245_FECMode_rfc2733Mode_mode_separateStream_differentPort },
-       {  1, "samePort", EXTENSION_ROOT,
+       {  1, "samePort", ASN1_EXTENSION_ROOT,
                dissect_h245_FECMode_rfc2733Mode_mode_separateStream_samePort },
        {  0, NULL, 0, NULL }
 };
@@ -17801,9 +17897,9 @@ static const value_string FECMode_rfc2733Mode_mode_vals[] = {
        {  0, NULL }
 };
 static per_choice_t FECMode_rfc2733Mode_mode_choice[] = {
-       {  0, "redundancyEncoding", EXTENSION_ROOT, 
+       {  0, "redundancyEncoding", ASN1_EXTENSION_ROOT,
                dissect_h245_NULL },
-       {  1, "separateStream", EXTENSION_ROOT,
+       {  1, "separateStream", ASN1_EXTENSION_ROOT,
                dissect_h245_FECMode_rfc2733Mode_mode_separateStream },
        {  0, NULL, 0, NULL }
 };
@@ -17818,7 +17914,7 @@ dissect_h245_FECMode_rfc2733Mode_mode(tvbuff_t *tvb, int offset, packet_info *pi
 
 
 static per_sequence_t FECMode_rfc2733Mode_sequence[] = {
-       { "mode", EXTENSION_ROOT, NOT_OPTIONAL,
+       { "mode", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_FECMode_rfc2733Mode_mode },
        { NULL, 0, 0, NULL }
 };
@@ -17838,7 +17934,7 @@ static const value_string FECMode_vals[] = {
        {  0, NULL }
 };
 static per_choice_t FECMode_choice[] = {
-       {  0, "rfc2733Mode", EXTENSION_ROOT,
+       {  0, "rfc2733Mode", ASN1_EXTENSION_ROOT,
                dissect_h245_FECMode_rfc2733Mode },
        {  0, NULL, 0, NULL }
 };
@@ -17863,11 +17959,11 @@ static const value_string FunctionNotUnderstood_vals[] = {
        {  0, NULL }
 };
 static per_choice_t FunctionNotUnderstood_choice[] = {
-       {  0, "request", NO_EXTENSIONS,
+       {  0, "request", ASN1_NO_EXTENSIONS,
                dissect_h245_RequestMessage },
-       {  1, "response", NO_EXTENSIONS,
+       {  1, "response", ASN1_NO_EXTENSIONS,
                dissect_h245_ResponseMessage },
-       {  2, "command", NO_EXTENSIONS,
+       {  2, "command", ASN1_NO_EXTENSIONS,
                dissect_h245_CommandMessage },
        {  0, NULL, 0, NULL }
 };
@@ -17884,7 +17980,24 @@ dissect_h245_FunctionNotUnderstood(tvbuff_t *tvb, int offset, packet_info *pinfo
 static int
 dissect_h245_signalType(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree)
 {
-       offset=dissect_per_restricted_character_string(tvb, offset, pinfo, tree, hf_h245_signalType, 1, 128, "!#*0123456789ABCD", 17);
+       /* XXX this is just wrong.
+         * the definition in the ASN.1 file is :
+        *   signalType IA5String (SIZE (1) ^ FROM ("0123456789#*ABCD!"))
+        * which means the 17 characters are encoded as 8-bit values 
+        * between 0x00 and 0x10
+         *
+        * however, captures from real world applications show that
+        * the field is encoded instead as :
+        *   signalType IA5String (SIZE (1))
+        * ie a single character ascii value from 0x00 to 0xff.
+        *
+        * the code is changed under protest.
+        * i still think it is the one commented out that is the correct one
+        */
+         /*offset=dissect_per_restricted_character_string(tvb, offset, pinfo, tree, hf_h245_signalType, 1, 1, "!#*0123456789ABCD", 17);*/
+
+         offset=dissect_per_IA5String(tvb, offset, pinfo, tree, hf_h245_signalType, 1, 1);
+
 
        return offset;
 }
@@ -17896,13 +18009,13 @@ dissect_h245_signalType(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tre
 
 
 static per_sequence_t UserInputIndication_signal_sequence[] = {
-       { "signalType", EXTENSION_ROOT, NOT_OPTIONAL,
+       { "signalType", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_signalType },
-       { "duration", EXTENSION_ROOT, OPTIONAL,
+       { "duration", ASN1_EXTENSION_ROOT, ASN1_OPTIONAL,
                dissect_h245_duration },
-       { "rtp", EXTENSION_ROOT, OPTIONAL,
+       { "rtp", ASN1_EXTENSION_ROOT, ASN1_OPTIONAL,
                dissect_h245_UserInputIndication_signal_rtp },
-       { "rtpPayloadIndication", NOT_EXTENSION_ROOT, OPTIONAL, 
+       { "rtpPayloadIndication", ASN1_NOT_EXTENSION_ROOT, ASN1_OPTIONAL,
                dissect_h245_NULL },
        { NULL, 0, 0, NULL }
 };
@@ -17927,17 +18040,17 @@ static const value_string UserInputIndication_vals[] = {
        {  0, NULL }
 };
 static per_choice_t UserInputIndication_choice[] = {
-       {  0, "nonStandard", EXTENSION_ROOT,
+       {  0, "nonStandard", ASN1_EXTENSION_ROOT,
                dissect_h245_NonStandardParameter },
-       {  1, "alphanumeric", EXTENSION_ROOT,
+       {  1, "alphanumeric", ASN1_EXTENSION_ROOT,
                dissect_h245_alphanumeric },
-       {  2, "userInputSupportIndication", NOT_EXTENSION_ROOT,
+       {  2, "userInputSupportIndication", ASN1_NOT_EXTENSION_ROOT,
                dissect_h245_UserInputIndication_userInputSupportIndication },
-       {  3, "signal", NOT_EXTENSION_ROOT,
+       {  3, "signal", ASN1_NOT_EXTENSION_ROOT,
                dissect_h245_UserInputIndication_signal },
-       {  4, "signalUpdate", NOT_EXTENSION_ROOT,
+       {  4, "signalUpdate", ASN1_NOT_EXTENSION_ROOT,
                dissect_h245_UserInputIndication_signalUpdate },
-       {  5, "extendedAlphanumeric", NOT_EXTENSION_ROOT,
+       {  5, "extendedAlphanumeric", ASN1_NOT_EXTENSION_ROOT,
                dissect_h245_UserInputIndication_extendedAlphanumeric },
        {  0, NULL, 0, NULL }
 };
@@ -17954,7 +18067,7 @@ dissect_h245_UserInputIndication(tvbuff_t *tvb, int offset, packet_info *pinfo,
 
 
 static per_sequence_t TerminalCapabilitySetRelease_sequence[] = {
-       { NULL, EXTENSION_ROOT, NOT_OPTIONAL, NULL }
+       { NULL, ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL, NULL }
 };
 static int
 dissect_h245_TerminalCapabilitySetRelease(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree)
@@ -17983,9 +18096,9 @@ static const value_string Q2931Address_address_vals[] = {
        {  0, NULL }
 };
 static per_choice_t Q2931Address_address_choice[] = {
-       {  0, "internationalNumber", EXTENSION_ROOT,
+       {  0, "internationalNumber", ASN1_EXTENSION_ROOT,
                dissect_h245_internationalNumber },
-       {  1, "nsapAddress", EXTENSION_ROOT, 
+       {  1, "nsapAddress", ASN1_EXTENSION_ROOT,
                dissect_h245_nsapAddress},
        {  0, NULL, 0, NULL }
 };
@@ -18002,9 +18115,9 @@ dissect_h245_Q2931Address_address(tvbuff_t *tvb, int offset, packet_info *pinfo,
 
 
 static per_sequence_t Q2931Address_sequence[] = {
-       { "address", EXTENSION_ROOT, NOT_OPTIONAL,
+       { "address", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_Q2931Address_address },
-       { "subaddress", EXTENSION_ROOT, OPTIONAL,
+       { "subaddress", ASN1_EXTENSION_ROOT, ASN1_OPTIONAL,
                dissect_h245_subaddress_1_20 },
        { NULL, 0, 0, NULL }
 };
@@ -18037,11 +18150,11 @@ static const value_string NetworkAccessParameters_networkAddress_vals[] = {
        {  0, NULL }
 };
 static per_choice_t NetworkAccessParameters_networkAddress_choice[] = {
-       {  0, "q2931Address", EXTENSION_ROOT,
+       {  0, "q2931Address", ASN1_EXTENSION_ROOT,
                dissect_h245_Q2931Address },
-       {  1, "e164Address", EXTENSION_ROOT,
+       {  1, "e164Address", ASN1_EXTENSION_ROOT,
                dissect_h245_e164Address },
-       {  2, "localAreaAddress", EXTENSION_ROOT, 
+       {  2, "localAreaAddress", ASN1_EXTENSION_ROOT,
                dissect_h245_localAreaAddress },
        {  0, NULL, 0, NULL }
 };
@@ -18058,15 +18171,15 @@ dissect_h245_NetworkAccessParameters_networkAddress(tvbuff_t *tvb, int offset, p
 
 
 static per_sequence_t NetworkAccessParameters_sequence[] = {
-       { "distribution", EXTENSION_ROOT, OPTIONAL, 
+       { "distribution", ASN1_EXTENSION_ROOT, ASN1_OPTIONAL,
                dissect_h245_NetworkAccessParameters_distribution },
-       { "networkAddress", EXTENSION_ROOT, NOT_OPTIONAL,
+       { "networkAddress", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_NetworkAccessParameters_networkAddress },
-       { "associateConference", EXTENSION_ROOT, NOT_OPTIONAL, 
+       { "associateConference", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_associateConference},
-       { "externalReference", EXTENSION_ROOT, OPTIONAL,
+       { "externalReference", ASN1_EXTENSION_ROOT, ASN1_OPTIONAL,
                dissect_h245_externalReference },
-       { "t120SetupProcedure", NOT_EXTENSION_ROOT, OPTIONAL, 
+       { "t120SetupProcedure", ASN1_NOT_EXTENSION_ROOT, ASN1_OPTIONAL,
                dissect_h245_NetworkAccessParameters_t120SetupProcedure },
        { NULL, 0, 0, NULL }
 };
@@ -18083,15 +18196,15 @@ dissect_h245_NetworkAccessParameters(tvbuff_t *tvb, int offset, packet_info *pin
 
 
 static per_sequence_t OpenLogicalChannel_sequence[] = {
-       { "forwardLogicalChannelNumber", EXTENSION_ROOT, NOT_OPTIONAL, 
+       { "forwardLogicalChannelNumber", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_LogicalChannelNumber },
-       { "forwardLogicalChannelParameters", EXTENSION_ROOT, NOT_OPTIONAL,
+       { "forwardLogicalChannelParameters", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_forwardLogicalChannelParameters },
-       { "reverseLogicalChannelParameters", EXTENSION_ROOT, OPTIONAL,
+       { "reverseLogicalChannelParameters", ASN1_EXTENSION_ROOT, ASN1_OPTIONAL,
                dissect_h245_reverseLogicalChannelParameters },
-       { "separateStack", NOT_EXTENSION_ROOT, OPTIONAL,
+       { "separateStack", ASN1_NOT_EXTENSION_ROOT, ASN1_OPTIONAL,
                dissect_h245_NetworkAccessParameters },
-       { "encryptionSync", NOT_EXTENSION_ROOT, OPTIONAL,
+       { "encryptionSync", ASN1_NOT_EXTENSION_ROOT, ASN1_OPTIONAL,
                dissect_h245_EncryptionSync },
        { NULL, 0, 0, NULL }
 };
@@ -18107,15 +18220,15 @@ dissect_h245_OpenLogicalChannel(tvbuff_t *tvb, int offset, packet_info *pinfo, p
 
 
 static per_sequence_t OpenLogicalChannelAck_sequence[] = {
-       { "forwardLogicalChannelNumber", EXTENSION_ROOT, NOT_OPTIONAL, 
+       { "forwardLogicalChannelNumber", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_LogicalChannelNumber },
-       { "reverseLogicalChannelParameters", EXTENSION_ROOT, OPTIONAL,
+       { "reverseLogicalChannelParameters", ASN1_EXTENSION_ROOT, ASN1_OPTIONAL,
                dissect_h245_OpenLogicalChannelAck_reverseLogicalChannelParameters },
-       { "separateStack", NOT_EXTENSION_ROOT, OPTIONAL,
+       { "separateStack", ASN1_NOT_EXTENSION_ROOT, ASN1_OPTIONAL,
                dissect_h245_NetworkAccessParameters },
-       { "forwardMultiplexAckParameters", NOT_EXTENSION_ROOT, OPTIONAL,
+       { "forwardMultiplexAckParameters", ASN1_NOT_EXTENSION_ROOT, ASN1_OPTIONAL,
                dissect_h245_forwardMultiplexAckParameters},
-       { "encryptionSync", NOT_EXTENSION_ROOT, OPTIONAL,
+       { "encryptionSync", ASN1_NOT_EXTENSION_ROOT, ASN1_OPTIONAL,
                dissect_h245_EncryptionSync},
        { NULL, 0, 0, NULL }
 };
@@ -18142,9 +18255,9 @@ NOT_DECODED_YET("escrowValue");
 
 
 static per_sequence_t EscrowData_sequence[] = {
-       { "escrowID", EXTENSION_ROOT, NOT_OPTIONAL,
+       { "escrowID", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_escrowID },
-       { "escrowValue", EXTENSION_ROOT, NOT_OPTIONAL,
+       { "escrowValue", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_escrowValue },
        { NULL, 0, 0, NULL }
 };
@@ -18170,9 +18283,9 @@ static const value_string RequestModeAck_response_decision_vals[] = {
        {  0, NULL }
 };
 static per_choice_t RequestModeAck_response_decision_choice[] = {
-       {  0, "willTransmitMostPreferredMode", EXTENSION_ROOT, 
+       {  0, "willTransmitMostPreferredMode", ASN1_EXTENSION_ROOT,
                dissect_h245_NULL },
-       {  1, "willTransmitLessPreferredMode", EXTENSION_ROOT, 
+       {  1, "willTransmitLessPreferredMode", ASN1_EXTENSION_ROOT,
                dissect_h245_NULL },
        {  0, NULL, 0, NULL }
 };
@@ -18189,9 +18302,9 @@ dissect_h245_RequestModeAck_response_decision(tvbuff_t *tvb, int offset, packet_
 
 
 static per_sequence_t RequestModeAck_sequence[] = {
-       { "sequenceNumber", EXTENSION_ROOT, NOT_OPTIONAL, 
+       { "sequenceNumber", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_SequenceNumber },
-       { "response", EXTENSION_ROOT, NOT_OPTIONAL,
+       { "response", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_RequestModeAck_response_decision },
        { NULL, 0, 0, NULL }
 };
@@ -18207,7 +18320,7 @@ dissect_h245_RequestModeAck(tvbuff_t *tvb, int offset, packet_info *pinfo, proto
 
 
 static per_sequence_t RequestModeRelease_sequence[] = {
-       { NULL, EXTENSION_ROOT, 0, NULL }
+       { NULL, ASN1_EXTENSION_ROOT, 0, NULL }
 };
 static int
 dissect_h245_RequestModeRelease(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree)
@@ -18220,7 +18333,7 @@ dissect_h245_RequestModeRelease(tvbuff_t *tvb, int offset, packet_info *pinfo, p
 
 
 static per_sequence_t MaintenanceLoopOffCommand_sequence[] = {
-       { NULL, EXTENSION_ROOT, 0, NULL }
+       { NULL, ASN1_EXTENSION_ROOT, 0, NULL }
 };
 static int
 dissect_h245_MaintenanceLoopOffCommand(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree)
@@ -18234,7 +18347,7 @@ dissect_h245_MaintenanceLoopOffCommand(tvbuff_t *tvb, int offset, packet_info *p
 
 
 static per_sequence_t CommunicationModeRequest_sequence[] = {
-       { NULL, EXTENSION_ROOT, 0, NULL }
+       { NULL, ASN1_EXTENSION_ROOT, 0, NULL }
 };
 static int
 dissect_h245_CommunicationModeRequest(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree)
@@ -18247,6 +18360,32 @@ dissect_h245_CommunicationModeRequest(tvbuff_t *tvb, int offset, packet_info *pi
 
 
 
+static const value_string IndicationMessage_short_vals[] = {
+       {  0,   "NSM" },
+       {  1,   "FNU" },
+       {  2,   "MSDRelease" },
+       {  3,   "TCSRelease" },
+       {  4,   "OLCConfirm" },
+       {  5,   "RCCRelease" },
+       {  6,   "MESRelease" },
+       {  7,   "RMERelease" },
+       {  8,   "RMRelease" },
+       {  9,   "MI" },
+       { 10,   "JI" },
+       { 11,   "H223SI" },
+       { 12,   "NATMVCI" },
+       { 13,   "UII" },
+       { 14,   "H2250MSI" },
+       { 15,   "MCLI" },
+       { 16,   "CI" },
+       { 17,   "VI" },
+       { 18,   "FNS" },
+       { 19,   "MultilinkIndication" },
+       { 20,   "LCRRelease" },
+       { 21,   "FCIndication" },
+       { 22,   "MMRI" },
+       {  0, NULL }
+};
 
 
 static const value_string IndicationMessage_vals[] = {
@@ -18276,51 +18415,51 @@ static const value_string IndicationMessage_vals[] = {
        {  0, NULL }
 };
 static per_choice_t IndicationMessage_choice[] = {
-       {  0,   "NonStandardMessage",                   EXTENSION_ROOT,
+       {  0,   "NonStandardMessage",                   ASN1_EXTENSION_ROOT,
                        dissect_h245_NonStandardMessage },
-       {  1,   "FunctionNotUnderstood",                EXTENSION_ROOT,
+       {  1,   "FunctionNotUnderstood",                ASN1_EXTENSION_ROOT,
                        dissect_h245_FunctionNotUnderstood },
-       {  2,   "MasterSlaveDeterminationRelease",      EXTENSION_ROOT,
+       {  2,   "MasterSlaveDeterminationRelease",      ASN1_EXTENSION_ROOT,
                        dissect_h245_MasterSlaveDeterminationRelease },
-       {  3,   "TerminalCapabilitySetRelease",         EXTENSION_ROOT,
+       {  3,   "TerminalCapabilitySetRelease",         ASN1_EXTENSION_ROOT,
                        dissect_h245_TerminalCapabilitySetRelease },
-       {  4,   "OpenLogicalChannelConfirm",            EXTENSION_ROOT, 
+       {  4,   "OpenLogicalChannelConfirm",            ASN1_EXTENSION_ROOT,
                        dissect_h245_OpenLogicalChannelConfirm },
-       {  5,   "RequestChannelCloseRelease",           EXTENSION_ROOT, 
+       {  5,   "RequestChannelCloseRelease",           ASN1_EXTENSION_ROOT,
                        dissect_h245_RequestChannelCloseRelease },
-       {  6,   "MultiplexEntrySendRelease",            EXTENSION_ROOT,
+       {  6,   "MultiplexEntrySendRelease",            ASN1_EXTENSION_ROOT,
                        dissect_h245_MultiplexEntrySendRelease },
-       {  7,   "RequestMultiplexEntryRelease",         EXTENSION_ROOT,
+       {  7,   "RequestMultiplexEntryRelease",         ASN1_EXTENSION_ROOT,
                        dissect_h245_RequestMultiplexEntryRelease },
-       {  8,   "RequestModeRelease",                   EXTENSION_ROOT,
+       {  8,   "RequestModeRelease",                   ASN1_EXTENSION_ROOT,
                        dissect_h245_RequestModeRelease },
-       {  9,   "MiscellaneousIndication",              EXTENSION_ROOT, 
+       {  9,   "MiscellaneousIndication",              ASN1_EXTENSION_ROOT,
                        dissect_h245_MiscellaneousIndication },
-       { 10,   "JitterIndication",                     EXTENSION_ROOT,
+       { 10,   "JitterIndication",                     ASN1_EXTENSION_ROOT,
                        dissect_h245_JitterIndication },
-       { 11,   "H223SkewIndication",                   EXTENSION_ROOT,
+       { 11,   "H223SkewIndication",                   ASN1_EXTENSION_ROOT,
                        dissect_h245_H223SkewIndication },
-       { 12,   "NewATMVCIndication",                   EXTENSION_ROOT,
+       { 12,   "NewATMVCIndication",                   ASN1_EXTENSION_ROOT,
                        dissect_h245_NewATMVCIndication },
-       { 13,   "UserInputIndication",                  EXTENSION_ROOT,
+       { 13,   "UserInputIndication",                  ASN1_EXTENSION_ROOT,
                        dissect_h245_UserInputIndication },
-       { 14,   "H2250MaximumSkewIndication",           NOT_EXTENSION_ROOT,
+       { 14,   "H2250MaximumSkewIndication",           ASN1_NOT_EXTENSION_ROOT,
                        dissect_h245_H2250MaximumSkewIndication },
-       { 15,   "MCLocationIndication",                 NOT_EXTENSION_ROOT,
+       { 15,   "MCLocationIndication",                 ASN1_NOT_EXTENSION_ROOT,
                        dissect_h245_MCLocationIndication },
-       { 16,   "ConferenceIndication",                 NOT_EXTENSION_ROOT,
+       { 16,   "ConferenceIndication",                 ASN1_NOT_EXTENSION_ROOT,
                dissect_h245_ConferenceIndication },
-       { 17,   "VendorIdentification",                 NOT_EXTENSION_ROOT,
+       { 17,   "VendorIdentification",                 ASN1_NOT_EXTENSION_ROOT,
                dissect_h245_VendorIdentification },
-       { 18,   "FunctionNotSupported",                 NOT_EXTENSION_ROOT,
+       { 18,   "FunctionNotSupported",                 ASN1_NOT_EXTENSION_ROOT,
                dissect_h245_FunctionNotSupported },
-       { 19,   "MultilinkIndication",                  NOT_EXTENSION_ROOT,
+       { 19,   "MultilinkIndication",                  ASN1_NOT_EXTENSION_ROOT,
                dissect_h245_MultilinkIndication },
-       { 20,   "LogicalChannelRateRelease",            NOT_EXTENSION_ROOT,
+       { 20,   "LogicalChannelRateRelease",            ASN1_NOT_EXTENSION_ROOT,
                dissect_h245_LogicalChannelRateRelease },
-       { 21,   "FlowControlIndication",                NOT_EXTENSION_ROOT,
+       { 21,   "FlowControlIndication",                ASN1_NOT_EXTENSION_ROOT,
                dissect_h245_FlowControlIndication },
-       { 22,   "MobileMultilinkReconfigurationIndication",NOT_EXTENSION_ROOT,
+       { 22,   "MobileMultilinkReconfigurationIndication",ASN1_NOT_EXTENSION_ROOT,
                dissect_h245_MobileMultilinkReconfigurationIndication },
        {  0, NULL, 0, NULL }
 };
@@ -18332,15 +18471,43 @@ dissect_h245_IndicationMessage(tvbuff_t *tvb, int offset, packet_info *pinfo, pr
        offset=dissect_per_choice(tvb, offset, pinfo, tree, hf_h245_IndicationMessage_type, ett_h245_IndicationMessage, IndicationMessage_choice, "IndicationMessage", &value);
 
        if (check_col(pinfo->cinfo, COL_INFO)){
-               col_prepend_fstr(pinfo->cinfo, COL_INFO, "%s ",
-                       val_to_str(value, IndicationMessage_vals, "<unknown>"));
+               if ( h245_shorttypes == TRUE )
+               {
+                       col_append_fstr(pinfo->cinfo, COL_INFO, "%s ",
+                               val_to_str(value, IndicationMessage_short_vals, "<unknown>"));
+               }
+               else
+               {
+                       col_append_fstr(pinfo->cinfo, COL_INFO, "%s ",
+                               val_to_str(value, IndicationMessage_vals, "<unknown>"));
+               }
        }
 
+       col_set_fence(pinfo->cinfo,COL_INFO);
+
        return offset;
 }
 
 
 
+static const value_string RequestMessage_short_vals[] = {
+       {  0,   "NSM" },
+       {  1,   "MSD" },
+       {  2,   "TCS" },
+       {  3,   "OLC" },
+       {  4,   "CLC" },
+       {  5,   "RCC" },
+       {  6,   "MES" },
+       {  7,   "RME" },
+       {  8,   "RM" },
+       {  9,   "RTDR" },
+       { 10,   "MLR" },
+       { 11,   "CMR" },
+       { 12,   "CR" },
+       { 13,   "MR" },
+       { 14,   "LCRR" },
+       {  0, NULL }
+};
 
 
 static const value_string RequestMessage_vals[] = {
@@ -18362,35 +18529,35 @@ static const value_string RequestMessage_vals[] = {
        {  0, NULL }
 };
 static per_choice_t RequestMessage_choice[] = {
-       {  0,   "NonStandardMessage",           EXTENSION_ROOT,
+       {  0,   "NonStandardMessage",           ASN1_EXTENSION_ROOT,
                        dissect_h245_NonStandardMessage },
-       {  1,   "MasterSlaveDetermination",     EXTENSION_ROOT, 
+       {  1,   "MasterSlaveDetermination",     ASN1_EXTENSION_ROOT,
                        dissect_h245_MasterSlaveDetermination },
-       {  2,   "TerminalCapabilitySet",        EXTENSION_ROOT,
+       {  2,   "TerminalCapabilitySet",        ASN1_EXTENSION_ROOT,
                        dissect_h245_TerminalCapabilitySet },
-       {  3,   "OpenLogicalChannel",           EXTENSION_ROOT,
+       {  3,   "OpenLogicalChannel",           ASN1_EXTENSION_ROOT,
                        dissect_h245_OpenLogicalChannel },
-       {  4,   "CloseLogicalChannel",          EXTENSION_ROOT, 
+       {  4,   "CloseLogicalChannel",          ASN1_EXTENSION_ROOT,
                        dissect_h245_CloseLogicalChannel },
-       {  5,   "RequestChannelClose",          EXTENSION_ROOT,
+       {  5,   "RequestChannelClose",          ASN1_EXTENSION_ROOT,
                        dissect_h245_RequestChannelClose },
-       {  6,   "MultiplexEntrySend",           EXTENSION_ROOT,
+       {  6,   "MultiplexEntrySend",           ASN1_EXTENSION_ROOT,
                        dissect_h245_MultiplexEntrySend },
-       {  7,   "RequestMultiplexEntry",        EXTENSION_ROOT,
+       {  7,   "RequestMultiplexEntry",        ASN1_EXTENSION_ROOT,
                        dissect_h245_RequestMultiplexEntry },
-       {  8,   "RequestMode",                  EXTENSION_ROOT,
+       {  8,   "RequestMode",                  ASN1_EXTENSION_ROOT,
                        dissect_h245_RequestMode },
-       {  9,   "RoundTripDelayRequest",        EXTENSION_ROOT, 
+       {  9,   "RoundTripDelayRequest",        ASN1_EXTENSION_ROOT,
                        dissect_h245_RoundTripDelayRequest },
-       { 10,   "MaintenanceLoopRequest",       EXTENSION_ROOT, 
+       { 10,   "MaintenanceLoopRequest",       ASN1_EXTENSION_ROOT,
                        dissect_h245_MaintenanceLoopRequest },
-       { 11,   "CommunicationModeRequest",     NOT_EXTENSION_ROOT,
+       { 11,   "CommunicationModeRequest",     ASN1_NOT_EXTENSION_ROOT,
                        dissect_h245_CommunicationModeRequest },
-       { 12,   "ConferenceRequest",            NOT_EXTENSION_ROOT,
+       { 12,   "ConferenceRequest",            ASN1_NOT_EXTENSION_ROOT,
                        dissect_h245_ConferenceRequest },
-       { 13,   "MultilinkRequest",             NOT_EXTENSION_ROOT,
+       { 13,   "MultilinkRequest",             ASN1_NOT_EXTENSION_ROOT,
                        dissect_h245_MultilinkRequest },
-       { 14,   "LogicalChannelRateRequest",    NOT_EXTENSION_ROOT,
+       { 14,   "LogicalChannelRateRequest",    ASN1_NOT_EXTENSION_ROOT,
                        dissect_h245_LogicalChannelRateRequest },
        {  0, NULL, 0, NULL }
 };
@@ -18400,11 +18567,26 @@ dissect_h245_RequestMessage(tvbuff_t *tvb, int offset, packet_info *pinfo, proto
        guint32 value;
 
        offset=dissect_per_choice(tvb, offset, pinfo, tree, hf_h245_RequestMessage_type, ett_h245_RequestMessage, RequestMessage_choice, "RequestMessage", &value);
+
        if (check_col(pinfo->cinfo, COL_INFO)){
-               col_prepend_fstr(pinfo->cinfo, COL_INFO, "%s ",
-                       val_to_str(value, RequestMessage_vals, "<unknown>"));
+               if ( h245_shorttypes == TRUE )
+               {
+                       col_append_fstr(pinfo->cinfo, COL_INFO, "%s ",
+                               val_to_str(value, RequestMessage_short_vals, "<unknown>"));
+               }
+               else
+               {
+                       col_append_fstr(pinfo->cinfo, COL_INFO, "%s ",
+                               val_to_str(value, RequestMessage_vals, "<unknown>"));
+               }
        }
 
+       if (( check_col(pinfo->cinfo, COL_INFO)) && ( codec_type != NULL ) && ( value == 3) ){
+               col_append_fstr(pinfo->cinfo, COL_INFO, "(%s) ", codec_type );
+       }
+
+        col_set_fence(pinfo->cinfo,COL_INFO);
+
        return offset;
 }
 
@@ -18432,21 +18614,21 @@ dissect_h245_distributedData_sequence_of(tvbuff_t *tvb, int offset, packet_info
 
 
 static per_sequence_t MediaDistributionCapability_sequence[] = {
-       { "centralizedControl", EXTENSION_ROOT, NOT_OPTIONAL, 
+       { "centralizedControl", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_centralizedControl },
-       { "distributedControl", EXTENSION_ROOT, NOT_OPTIONAL, 
+       { "distributedControl", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_distributedControl },
-       { "centralizedAudio", EXTENSION_ROOT, NOT_OPTIONAL, 
+       { "centralizedAudio", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_centralizedAudio },
-       { "distributedAudio", EXTENSION_ROOT, NOT_OPTIONAL, 
+       { "distributedAudio", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_distributedAudio },
-       { "centralizedVideo", EXTENSION_ROOT, NOT_OPTIONAL, 
+       { "centralizedVideo", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_centralizedVideo },
-       { "distributedVideo", EXTENSION_ROOT, NOT_OPTIONAL, 
+       { "distributedVideo", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_distributedVideo },
-       { "centralizedData", EXTENSION_ROOT, OPTIONAL,
+       { "centralizedData", ASN1_EXTENSION_ROOT, ASN1_OPTIONAL,
                dissect_h245_centralizedData_sequence_of },
-       { "distributedData", EXTENSION_ROOT, OPTIONAL,
+       { "distributedData", ASN1_EXTENSION_ROOT, ASN1_OPTIONAL,
                dissect_h245_distributedData_sequence_of },
        { NULL, 0, 0, NULL }
 };
@@ -18482,9 +18664,9 @@ dissect_h245_rtpPayloadType_sequence_of(tvbuff_t *tvb, int offset, packet_info *
 
 
 static per_sequence_t H223ModeParameters_sequence[] = {
-       { "adaptationLayerType", EXTENSION_ROOT, NOT_OPTIONAL,
+       { "adaptationLayerType", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_H223ModeParameters_adaptationLayerType },
-       { "segmentableFlag", EXTENSION_ROOT, NOT_OPTIONAL, 
+       { "segmentableFlag", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_segmentableFlag },
        { NULL, 0, 0, NULL }
 };
@@ -18501,17 +18683,17 @@ dissect_h245_H223ModeParameters(tvbuff_t *tvb, int offset, packet_info *pinfo, p
 
 
 static per_sequence_t ModeElement_sequence[] = {
-       { "type", EXTENSION_ROOT, NOT_OPTIONAL,
+       { "type", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_ModeElementType },
-       { "h223ModeParameters", EXTENSION_ROOT, OPTIONAL,
+       { "h223ModeParameters", ASN1_EXTENSION_ROOT, ASN1_OPTIONAL,
                dissect_h245_H223ModeParameters },
-       { "v76ModeParameters", NOT_EXTENSION_ROOT, OPTIONAL, 
+       { "v76ModeParameters", ASN1_NOT_EXTENSION_ROOT, ASN1_OPTIONAL,
                dissect_h245_V76ModeParameters },
-       { "h2250ModeParameters", NOT_EXTENSION_ROOT, OPTIONAL,
+       { "h2250ModeParameters", ASN1_NOT_EXTENSION_ROOT, ASN1_OPTIONAL,
                dissect_h245_H2250ModeParameters },
-       { "genericModeParameters", NOT_EXTENSION_ROOT, OPTIONAL,
+       { "genericModeParameters", ASN1_NOT_EXTENSION_ROOT, ASN1_OPTIONAL,
                dissect_h245_GenericCapability },
-       { "multiplexedStreamModeParameters", NOT_EXTENSION_ROOT, OPTIONAL, 
+       { "multiplexedStreamModeParameters", ASN1_NOT_EXTENSION_ROOT, ASN1_OPTIONAL,
                dissect_h245_MultiplexedStreamModeParameters },
        { NULL, 0, 0, NULL }
 };
@@ -18554,11 +18736,11 @@ dissect_h245_t38FaxMaxDatagram(tvbuff_t *tvb, int offset, packet_info *pinfo, pr
 
 
 static per_sequence_t T38FaxUdpOptions_sequence[] = {
-       { "t38FaxMaxBuffer", NO_EXTENSIONS, OPTIONAL,
+       { "t38FaxMaxBuffer", ASN1_NO_EXTENSIONS, ASN1_OPTIONAL,
                dissect_h245_t38FaxMaxBuffer },
-       { "t38FaxMaxDatagram", NO_EXTENSIONS, OPTIONAL,
+       { "t38FaxMaxDatagram", ASN1_NO_EXTENSIONS, ASN1_OPTIONAL,
                dissect_h245_t38FaxMaxDatagram },
-       { "t38FaxUdpEC", NO_EXTENSIONS, NOT_OPTIONAL,
+       { "t38FaxUdpEC", ASN1_NO_EXTENSIONS, ASN1_NOT_OPTIONAL,
                dissect_h245_T38FaxUdpOptions_t38FaxUdpEC },
        { NULL, 0, 0, NULL }
 };
@@ -18585,31 +18767,31 @@ NOT_DECODED_YET("sessionDescription");
 
 
 static per_sequence_t CommunicationModeTableEntry_sequence[] = {
-       { "nonStandard", EXTENSION_ROOT, OPTIONAL,
+       { "nonStandard", ASN1_EXTENSION_ROOT, ASN1_OPTIONAL,
                dissect_h245_nonStandardData_sequence_of },
-       { "sessionID", EXTENSION_ROOT, NOT_OPTIONAL,
+       { "sessionID", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_sessionID_1_255 },
-       { "associatedSessionID", EXTENSION_ROOT, OPTIONAL,
+       { "associatedSessionID", ASN1_EXTENSION_ROOT, ASN1_OPTIONAL,
                dissect_h245_associatedSessionID },
-       { "terminalLabel", EXTENSION_ROOT, OPTIONAL,
+       { "terminalLabel", ASN1_EXTENSION_ROOT, ASN1_OPTIONAL,
                dissect_h245_TerminalLabel },
-       { "sessionDescription", EXTENSION_ROOT, NOT_OPTIONAL,
+       { "sessionDescription", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_sessionDescription },
-       { "dataType", EXTENSION_ROOT, NOT_OPTIONAL,
+       { "dataType", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_CommunicationModeTableEntry_dataType },
-       { "mediaChannel", EXTENSION_ROOT, OPTIONAL,
+       { "mediaChannel", ASN1_EXTENSION_ROOT, ASN1_OPTIONAL,
                dissect_h245_mediaChannel },
-       { "mediaGuaranteedDelivery", EXTENSION_ROOT, OPTIONAL, 
+       { "mediaGuaranteedDelivery", ASN1_EXTENSION_ROOT, ASN1_OPTIONAL,
                dissect_h245_mediaGuaranteedDelivery },
-       { "mediaControlChannel", EXTENSION_ROOT, OPTIONAL,
+       { "mediaControlChannel", ASN1_EXTENSION_ROOT, ASN1_OPTIONAL,
                dissect_h245_mediaControlChannel },
-       { "mediaControlGuaranteedDelivery", EXTENSION_ROOT, OPTIONAL, 
+       { "mediaControlGuaranteedDelivery", ASN1_EXTENSION_ROOT, ASN1_OPTIONAL,
                dissect_h245_mediaControlGuaranteedDelivery },
-       { "redundancyEncoding", NOT_EXTENSION_ROOT, OPTIONAL,
+       { "redundancyEncoding", ASN1_NOT_EXTENSION_ROOT, ASN1_OPTIONAL,
                dissect_h245_RedundancyEncoding },
-       { "sessionDependency", NOT_EXTENSION_ROOT, OPTIONAL,
+       { "sessionDependency", ASN1_NOT_EXTENSION_ROOT, ASN1_OPTIONAL,
                dissect_h245_sessionDependency },
-       { "destination", NOT_EXTENSION_ROOT, OPTIONAL,
+       { "destination", ASN1_NOT_EXTENSION_ROOT, ASN1_OPTIONAL,
                dissect_h245_TerminalLabel },
        { NULL, 0, 0, NULL }
 };
@@ -18625,19 +18807,19 @@ dissect_h245_CommunicationModeTableEntry(tvbuff_t *tvb, int offset, packet_info
 
 
 static per_sequence_t NewATMVCCommand_sequence[] = {
-       { "resouceID", EXTENSION_ROOT, NOT_OPTIONAL,
+       { "resouceID", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_resourceID },
-       { "bitRate", EXTENSION_ROOT, NOT_OPTIONAL,
+       { "bitRate", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_ATM_BitRate },
-       { "bitRateLockedToPCRClock", EXTENSION_ROOT, NOT_OPTIONAL,
+       { "bitRateLockedToPCRClock", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_bitRateLockedToPCRClock },
-       { "bitRateLockedToNetworkClock", EXTENSION_ROOT, NOT_OPTIONAL, 
+       { "bitRateLockedToNetworkClock", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_bitRateLockedToNetworkClock },
-       { "aal", EXTENSION_ROOT, NOT_OPTIONAL, 
+       { "aal", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_NewATMVCCommand_aal },
-       { "multiplex", EXTENSION_ROOT, NOT_OPTIONAL, 
+       { "multiplex", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_NewATMVCCommand_multiplex },
-       { "reverseParameters", EXTENSION_ROOT, NOT_OPTIONAL,
+       { "reverseParameters", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_NewATMVCCommand_reverseParameters },
        { NULL, 0, 0, NULL }
 };
@@ -18649,6 +18831,21 @@ dissect_h245_NewATMVCCommand(tvbuff_t *tvb, int offset, packet_info *pinfo, prot
        return offset;
 }
 
+static const value_string CommandMessage_short_vals[] = {
+       {  0,   "NSM" },
+       {  1,   "MLOC" },
+       {  2,   "STCS" },
+       {  3,   "EC" },
+       {  4,   "FCC" },
+       {  5,   "ESC" },
+       {  6,   "MC" },
+       {  7,   "CMC" },
+       {  8,   "CC" },
+       {  9,   "H223MR" },
+       { 10,   "NATMVCC" },
+       { 11,   "MMRC" },
+       {  0, NULL }
+};
 
 
 
@@ -18668,29 +18865,29 @@ static const value_string CommandMessage_vals[] = {
        {  0, NULL }
 };
 static per_choice_t CommandMessage_choice[] = {
-       {  0,   "NonStandardMessage",           EXTENSION_ROOT,
+       {  0,   "NonStandardMessage",           ASN1_EXTENSION_ROOT,
                        dissect_h245_NonStandardMessage },
-       {  1,   "MaintenanceLoopOffCommand",    EXTENSION_ROOT,
+       {  1,   "MaintenanceLoopOffCommand",    ASN1_EXTENSION_ROOT,
                        dissect_h245_MaintenanceLoopOffCommand },
-       {  2,   "SendTerminalCapabilitySet",    EXTENSION_ROOT,
+       {  2,   "SendTerminalCapabilitySet",    ASN1_EXTENSION_ROOT,
                        dissect_h245_SendTerminalCapabilitySet },
-       {  3,   "EncryptionCommand",            EXTENSION_ROOT,
+       {  3,   "EncryptionCommand",            ASN1_EXTENSION_ROOT,
                        dissect_h245_EncryptionCommand },
-       {  4,   "FlowControlCommand",           EXTENSION_ROOT,
+       {  4,   "FlowControlCommand",           ASN1_EXTENSION_ROOT,
                        dissect_h245_FlowControlCommand },
-       {  5,   "EndSessionCommand",            EXTENSION_ROOT,
+       {  5,   "EndSessionCommand",            ASN1_EXTENSION_ROOT,
                        dissect_h245_EndSessionCommand },
-       {  6,   "MiscellaneousCommand",         EXTENSION_ROOT,
+       {  6,   "MiscellaneousCommand",         ASN1_EXTENSION_ROOT,
                        dissect_h245_MiscellaneousCommand },
-       {  7,   "CommunicationModeCommand",     NOT_EXTENSION_ROOT,
+       {  7,   "CommunicationModeCommand",     ASN1_NOT_EXTENSION_ROOT,
                        dissect_h245_CommunicationModeCommand },
-       {  8,   "ConferenceCommand",            NOT_EXTENSION_ROOT,
+       {  8,   "ConferenceCommand",            ASN1_NOT_EXTENSION_ROOT,
                        dissect_h245_ConferenceCommand },
-       {  9,   "H223MultiplexReconfiguration", NOT_EXTENSION_ROOT, 
+       {  9,   "H223MultiplexReconfiguration", ASN1_NOT_EXTENSION_ROOT,
                        dissect_h245_H223MultiplexReconfiguration },
-       { 10,   "NewATMVCCommand",              NOT_EXTENSION_ROOT,
+       { 10,   "NewATMVCCommand",              ASN1_NOT_EXTENSION_ROOT,
                        dissect_h245_NewATMVCCommand },
-       { 11,   "MobileMultilinkReconfigurationCommand",NOT_EXTENSION_ROOT,
+       { 11,   "MobileMultilinkReconfigurationCommand",ASN1_NOT_EXTENSION_ROOT,
                        dissect_h245_MobileMultilinkReconfigurationCommand },
        {  0, NULL, 0, NULL }
 };
@@ -18702,16 +18899,53 @@ dissect_h245_CommandMessage(tvbuff_t *tvb, int offset, packet_info *pinfo, proto
        offset=dissect_per_choice(tvb, offset, pinfo, tree, hf_h245_CommandMessage_type, ett_h245_CommandMessage, CommandMessage_choice, "CommandMessage", &value);
 
        if (check_col(pinfo->cinfo, COL_INFO)){
-               col_prepend_fstr(pinfo->cinfo, COL_INFO, "%s ",
-                       val_to_str(value, CommandMessage_vals, "<unknown>"));
+               if ( h245_shorttypes == TRUE )
+               {
+                       col_append_fstr(pinfo->cinfo, COL_INFO, "%s ",
+                               val_to_str(value, CommandMessage_short_vals, "<unknown>"));
+               }
+               else
+               {
+                       col_append_fstr(pinfo->cinfo, COL_INFO, "%s ",
+                               val_to_str(value, CommandMessage_vals, "<unknown>"));
+               }
        }
 
+       col_set_fence(pinfo->cinfo,COL_INFO);
+
        return offset;
 }
 
 
 
 
+static const value_string ResponseMessage_short_vals[] = {
+       {  0,   "NSM" },
+       {  1,   "MSDAck" },
+       {  2,   "MSDReject" },
+       {  3,   "TCSAck" },
+       {  4,   "TCSReject" },
+       {  5,   "OLCAck" },
+       {  6,   "OLCReject" },
+       {  7,   "CLCAck" },
+       {  8,   "RCCAck" },
+       {  9,   "RCCReject" },
+       { 10,   "MESAck" },
+       { 11,   "MESReject" },
+       { 12,   "RMEAck" },
+       { 13,   "RMEReject" },
+       { 14,   "RMAck" },
+       { 15,   "RMReject" },
+       { 16,   "RTDResponse" },
+       { 17,   "MLAck" },
+       { 18,   "MLReject" },
+       { 19,   "CMResponse" },
+       { 20,   "CResponse" },
+       { 21,   "MResponse" },
+       { 22,   "LCRAck" },
+       { 23,   "LCRReject" },
+       {  0, NULL }
+};
 
 
 static const value_string ResponseMessage_vals[] = {
@@ -18742,53 +18976,53 @@ static const value_string ResponseMessage_vals[] = {
        {  0, NULL }
 };
 static per_choice_t ResponseMessage_choice[] = {
-       {  0,   "NonStandardMessage",           EXTENSION_ROOT,
+       {  0,   "NonStandardMessage",           ASN1_EXTENSION_ROOT,
                        dissect_h245_NonStandardMessage },
-       {  1,   "MasterSlaveDeterminationAck",  EXTENSION_ROOT,
+       {  1,   "MasterSlaveDeterminationAck",  ASN1_EXTENSION_ROOT,
                        dissect_h245_MasterSlaveDeterminationAck },
-       {  2,   "MasterSlaveDeterminationReject",EXTENSION_ROOT,
+       {  2,   "MasterSlaveDeterminationReject",ASN1_EXTENSION_ROOT,
                        dissect_h245_MasterSlaveDeterminationReject },
-       {  3,   "TerminalCapabilitySetAck",     EXTENSION_ROOT, 
+       {  3,   "TerminalCapabilitySetAck",     ASN1_EXTENSION_ROOT,
                        dissect_h245_TerminalCapabilitySetAck },
-       {  4,   "TerminalCapabilitySetReject",  EXTENSION_ROOT,
+       {  4,   "TerminalCapabilitySetReject",  ASN1_EXTENSION_ROOT,
                        dissect_h245_TerminalCapabilitySetReject },
-       {  5,   "OpenLogicalChannelAck",        EXTENSION_ROOT,
+       {  5,   "OpenLogicalChannelAck",        ASN1_EXTENSION_ROOT,
                        dissect_h245_OpenLogicalChannelAck },
-       {  6,   "OpenLogicalChannelReject",     EXTENSION_ROOT, 
+       {  6,   "OpenLogicalChannelReject",     ASN1_EXTENSION_ROOT,
                        dissect_h245_OpenLogicalChannelReject },
-       {  7,   "CloseLogicalChannelAck",       EXTENSION_ROOT, 
+       {  7,   "CloseLogicalChannelAck",       ASN1_EXTENSION_ROOT,
                        dissect_h245_CloseLogicalChannelAck },
-       {  8,   "RequestChannelCloseAck",       EXTENSION_ROOT, 
+       {  8,   "RequestChannelCloseAck",       ASN1_EXTENSION_ROOT,
                        dissect_h245_RequestChannelCloseAck },
-       {  9,   "RequestChannelCloseReject",    EXTENSION_ROOT, 
+       {  9,   "RequestChannelCloseReject",    ASN1_EXTENSION_ROOT,
                        dissect_h245_RequestChannelCloseReject },
-       { 10,   "MultiplexEntrySendAck",        EXTENSION_ROOT,
+       { 10,   "MultiplexEntrySendAck",        ASN1_EXTENSION_ROOT,
                        dissect_h245_MultiplexEntrySendAck },
-       { 11,   "MultiplexEntrySendReject",     EXTENSION_ROOT,
+       { 11,   "MultiplexEntrySendReject",     ASN1_EXTENSION_ROOT,
                        dissect_h245_MultiplexEntrySendReject },
-       { 12,   "RequestMultiplexEntryAck",     EXTENSION_ROOT,
+       { 12,   "RequestMultiplexEntryAck",     ASN1_EXTENSION_ROOT,
                        dissect_h245_RequestMultiplexEntryAck },
-       { 13,   "RequestMultiplexEntryReject",  EXTENSION_ROOT,
+       { 13,   "RequestMultiplexEntryReject",  ASN1_EXTENSION_ROOT,
                        dissect_h245_RequestMultiplexEntryReject },
-       { 14,   "RequestModeAck",               EXTENSION_ROOT,
+       { 14,   "RequestModeAck",               ASN1_EXTENSION_ROOT,
                        dissect_h245_RequestModeAck },
-       { 15,   "RequestModeReject",            EXTENSION_ROOT, 
+       { 15,   "RequestModeReject",            ASN1_EXTENSION_ROOT,
                        dissect_h245_RequestModeReject },
-       { 16,   "RoundTripDelayResponse",       EXTENSION_ROOT, 
+       { 16,   "RoundTripDelayResponse",       ASN1_EXTENSION_ROOT,
                        dissect_h245_RoundTripDelayResponse },
-       { 17,   "MaintenanceLoopAck",           EXTENSION_ROOT, 
+       { 17,   "MaintenanceLoopAck",           ASN1_EXTENSION_ROOT,
                        dissect_h245_MaintenanceLoopAck },
-       { 18,   "MaintenanceLoopReject",        EXTENSION_ROOT, 
+       { 18,   "MaintenanceLoopReject",        ASN1_EXTENSION_ROOT,
                        dissect_h245_MaintenanceLoopReject },
-       { 19,   "CommunicationModeResponse",    NOT_EXTENSION_ROOT,
+       { 19,   "CommunicationModeResponse",    ASN1_NOT_EXTENSION_ROOT,
                        dissect_h245_CommunicationModeResponse },
-       { 20,   "ConferenceResponse",           NOT_EXTENSION_ROOT,
+       { 20,   "ConferenceResponse",           ASN1_NOT_EXTENSION_ROOT,
                        dissect_h245_ConferenceResponse },
-       { 21,   "MultilinkResponse",            NOT_EXTENSION_ROOT,
+       { 21,   "MultilinkResponse",            ASN1_NOT_EXTENSION_ROOT,
                        dissect_h245_MultilinkResponse },
-       { 22,   "LogicalChannelRateAck",        NOT_EXTENSION_ROOT,
+       { 22,   "LogicalChannelRateAck",        ASN1_NOT_EXTENSION_ROOT,
                        dissect_h245_LogicalChannelRateAck },
-       { 23,   "LogicalChannelRateReject",     NOT_EXTENSION_ROOT,
+       { 23,   "LogicalChannelRateReject",     ASN1_NOT_EXTENSION_ROOT,
                        dissect_h245_LogicalChannelRateReject },
        {  0, NULL, 0, NULL }
 };
@@ -18800,10 +19034,20 @@ dissect_h245_ResponseMessage(tvbuff_t *tvb, int offset, packet_info *pinfo, prot
        offset=dissect_per_choice(tvb, offset, pinfo, tree, hf_h245_ResponseMessage_type, ett_h245_ResponseMessage, ResponseMessage_choice, "ResponseMessage", &value);
 
        if (check_col(pinfo->cinfo, COL_INFO)){
-               col_prepend_fstr(pinfo->cinfo, COL_INFO, "%s ",
-                       val_to_str(value, ResponseMessage_vals, "<unknown>"));
+               if ( h245_shorttypes == TRUE )
+               {
+                       col_append_fstr(pinfo->cinfo, COL_INFO, "%s ",
+                               val_to_str(value, ResponseMessage_short_vals, "<unknown>"));
+               }
+               else
+               {
+                       col_append_fstr(pinfo->cinfo, COL_INFO, "%s ",
+                               val_to_str(value, ResponseMessage_vals, "<unknown>"));
+               }
        }
 
+       col_set_fence(pinfo->cinfo,COL_INFO);
+
        return offset;
 }
 
@@ -18834,11 +19078,11 @@ dissect_h245_DialingInformationNumber_subAddress(tvbuff_t *tvb, int offset, pack
 
 
 static per_sequence_t DialingInformationNumber_sequence[] = {
-       { "networkAddress", EXTENSION_ROOT, NOT_OPTIONAL,
+       { "networkAddress", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_DialingInformationNumber_networkAddress },
-       { "subAddress", EXTENSION_ROOT, OPTIONAL,
+       { "subAddress", ASN1_EXTENSION_ROOT, ASN1_OPTIONAL,
                dissect_h245_DialingInformationNumber_subAddress },
-       { "networkType", EXTENSION_ROOT, NOT_OPTIONAL,
+       { "networkType", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL,
                dissect_h245_networkType },
        { NULL, 0, 0, NULL }
 };
@@ -18859,13 +19103,13 @@ static const value_string MultimediaSystemControlMessage_vals[] = {
        { 0, NULL }
 };
 static per_choice_t MultimediaSystemControlMessage_choice[] = {
-       { 0,    "Request",      EXTENSION_ROOT, 
+       { 0,    "Request",      ASN1_EXTENSION_ROOT,
                        dissect_h245_RequestMessage },
-       { 1,    "Response",     EXTENSION_ROOT, 
+       { 1,    "Response",     ASN1_EXTENSION_ROOT,
                        dissect_h245_ResponseMessage },
-       { 2,    "Command",      EXTENSION_ROOT, 
+       { 2,    "Command",      ASN1_EXTENSION_ROOT,
                        dissect_h245_CommandMessage },
-       { 3,    "Indication",   EXTENSION_ROOT, 
+       { 3,    "Indication",   ASN1_EXTENSION_ROOT,
                        dissect_h245_IndicationMessage },
        { 0, NULL, 0, NULL }
 };
@@ -18880,9 +19124,6 @@ dissect_h245_MultimediaSystemControlMessage(tvbuff_t *tvb, packet_info *pinfo, p
        if (check_col(pinfo->cinfo, COL_PROTOCOL)){
                col_set_str(pinfo->cinfo, COL_PROTOCOL, "H.245");
        }
-       if (check_col(pinfo->cinfo, COL_INFO)){
-               col_clear(pinfo->cinfo, COL_INFO);
-       }
 
        it=proto_tree_add_protocol_format(tree, proto_h245, tvb, 0, tvb_length(tvb), "H.245");
        tr=proto_item_add_subtree(it, ett_h245);
@@ -18899,12 +19140,6 @@ dissect_h245_MultimediaSystemControlMessage(tvbuff_t *tvb, packet_info *pinfo, p
                        offset=(offset&0xfffffff8)+8;
                }
        }
-
-       if (check_col(pinfo->cinfo, COL_INFO)){
-               col_prepend_fstr(pinfo->cinfo, COL_INFO, "%s ",
-                       val_to_str(value, MultimediaSystemControlMessage_vals, "<unknown>"));
-       }
-       
 }
 
 
@@ -20833,7 +21068,7 @@ proto_register_h245(void)
                NULL, 0, "ATM BitRate in 64kbit/s units", HFILL }},
        { &hf_h245_t35CountryCode,
                { "t35CountryCode", "h245.t35CountryCode", FT_UINT32, BASE_DEC,
-               NULL, 0, "t35CountryCode value", HFILL }},
+               VALS(T35CountryCode_vals), 0, "t35CountryCode value", HFILL }},
        { &hf_h245_t35Extension,
                { "t35Extension", "h245.t35Extension", FT_UINT32, BASE_DEC,
                NULL, 0, "t35Extension value", HFILL }},
@@ -21710,6 +21945,9 @@ proto_register_h245(void)
        { &hf_h245_internationalNumber,
                { "internationalNumber", "h245.internationalNumber", FT_STRING, FT_NONE,
                NULL, 0, "String for internationalNumber", HFILL }},
+       { &hf_h245_h221Manufacturer,
+               { "H.221 Manufacturer", "h245.h221Manufacturer", FT_UINT32, BASE_HEX,
+               VALS(H221ManufacturerCode_vals), 0, "H.221 Manufacturer", HFILL }},
        };
 
        static gint *ett[] =
@@ -22205,17 +22443,25 @@ proto_register_h245(void)
                "Reassemble H.245 over TCP",
                "Whether the dissector should reassemble H.245 PDUs spanning multiple TCP segments",
                &h245_reassembly);
+       prefs_register_bool_preference(h245_module, "shorttypes",
+               "Show short message types",
+               "Whether the dissector should show short names or the long names from the standard",
+               &h245_shorttypes);
        register_dissector("h245dg", dissect_h245_MultimediaSystemControlMessage, proto_h245);
+       register_dissector("h245", dissect_h245, proto_h245);
+
+       nsp_object_dissector_table = register_dissector_table("h245.nsp.object", "H.245 NonStandardParameter (object)", FT_STRING, BASE_NONE);
+       nsp_h221_dissector_table = register_dissector_table("h245.nsp.h221", "H.245 NonStandardParameter (h221)", FT_UINT32, BASE_HEX);
 }
 
 void
 proto_reg_handoff_h245(void)
 {
-       h245_handle=create_dissector_handle(dissect_h245, proto_h245);
-       MultimediaSystemControlMessage_handle=create_dissector_handle(dissect_h245_MultimediaSystemControlMessage, proto_h245);
-
+       rtp_handle = find_dissector("rtp");
+       rtcp_handle = find_dissector("rtcp");
 
+       h245_handle=create_dissector_handle(dissect_h245, proto_h245);
        dissector_add_handle("tcp.port", h245_handle);
+       MultimediaSystemControlMessage_handle=create_dissector_handle(dissect_h245_MultimediaSystemControlMessage, proto_h245);
        dissector_add_handle("udp.port", MultimediaSystemControlMessage_handle);
-
 }