Get our dynamic payload name from the correct location.

svn path=/trunk/; revision=33525

1 files changed, 8 insertions, 3 deletions

diff --git a/gtk/voip_calls.c b/gtk/voip_calls.c
index 8760721b36..655329d728 100644
--- a/gtk/voip_calls.c
+++ b/gtk/voip_calls.c
@@ -535,11 +535,16 @@ RTP_packet(void *ptr _U_, packet_info *pinfo, epan_dissect_t *edt _U_, void cons
 		strinfo->pt_str = NULL;
 		strinfo->is_srtp = pi->info_is_srtp;
 		/* if it is dynamic payload, let use the conv data to see if it is defined */
-		if ( (strinfo->pt>95) && (strinfo->pt<128) ) {
+		if ( (strinfo->pt >= PT_UNDF_96) && (strinfo->pt <= PT_UNDF_127) ) {
 			/* Use existing packet info if available */
 			p_conv_data = p_get_proto_data(pinfo->fd, proto_get_id_by_filter_name("rtp"));
-			if (p_conv_data && p_conv_data->rtp_dyn_payload)
-				strinfo->pt_str = g_strdup(g_hash_table_lookup(p_conv_data->rtp_dyn_payload, &strinfo->pt));
+			if (p_conv_data && p_conv_data->rtp_dyn_payload) {
+				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, &strinfo->pt);
+				if (encoding_name_and_rate_pt) {
+					strinfo->pt_str = g_strdup(encoding_name_and_rate_pt->encoding_name);
+				}
+			}
 		}
 		if (!strinfo->pt_str) strinfo->pt_str = g_strdup(val_to_str(strinfo->pt, rtp_payload_type_short_vals, "%u"));
 		strinfo->npackets = 0;