RTP: display payload type name from dynamic payload type table

H.223: use just one protocol for bot dissectors for more clear protocol disabling

svn path=/trunk/; revision=36391

diff --git a/epan/dissectors/packet-h223.c b/epan/dissectors/packet-h223.c
index fadeb13622ac76e4a1a083072a7668b1ab540efc..a70bb1274266e6e06987df27df1a4cfb1c9cd0c9 100644 (file)
--- a/epan/dissectors/packet-h223.c
+++ b/epan/dissectors/packet-h223.c
@@ -54,7 +54,6 @@
 
 /* Wireshark ID of the H.223 protocol */
 static int proto_h223 = -1;
-static int proto_h223_bitswapped = -1;
 
 /* The following hf_* variables are used to hold the Wireshark IDs of
  * our header fields; they are filled out when we call
@@ -1599,13 +1598,11 @@ void proto_register_h223 (void)
 
     proto_h223 =
         proto_register_protocol ("ITU-T Recommendation H.223", "H.223", "h223");
-    proto_h223_bitswapped =
-        proto_register_protocol ("Bitswapped ITU-T Recommendation H.223", "H.223 (Bitswapped)", "h223_bitswapped");
 
     proto_register_field_array (proto_h223, hf, array_length (hf));
     proto_register_subtree_array (ett, array_length (ett));
     register_dissector("h223", dissect_h223, proto_h223);
-    register_dissector("h223_bitswapped", dissect_h223_bitswapped, proto_h223_bitswapped);
+    register_dissector("h223_bitswapped", dissect_h223_bitswapped, proto_h223);
 
     /* register our init routine to be called at the start of a capture,
        to clear out our hash tables etc */

diff --git a/epan/dissectors/packet-rtp.c b/epan/dissectors/packet-rtp.c
index 1c8f992b02bf9f91bfc69b698d08f8d3bd41f5c3..7cf87e6d21df3f43eda435d70a67e6ec40ed767b 100644 (file)
--- a/epan/dissectors/packet-rtp.c
+++ b/epan/dissectors/packet-rtp.c
@@ -1318,7 +1318,7 @@ dissect_rtp( tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree )
                        encoding_name_and_rate_t *encoding_name_and_rate_pt = NULL;
                        encoding_name_and_rate_pt = g_hash_table_lookup(p_conv_data->rtp_dyn_payload, &payload_type);
                        if (encoding_name_and_rate_pt) {
-                               rtp_info->info_payload_type_str = encoding_name_and_rate_pt->encoding_name;
+                               rtp_info->info_payload_type_str = payload_type_str = encoding_name_and_rate_pt->encoding_name;
                                rtp_info->info_payload_rate = encoding_name_and_rate_pt->sample_rate;
                        }
                }