diff options
| author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-09-19 04:14:53 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-09-19 04:14:53 +0000 |
| commit | a86c5f7cae7ec9a3398300555a0b644689d946a1 (patch) | |
| tree | 39fe4b107c71174fd1e8a8ceb9a4d2aa14116248 /ui/rtp_media.c | |
| parent | Releasing progress-linux version 4.2.6-1~progress7.99u1. (diff) | |
| download | wireshark-a86c5f7cae7ec9a3398300555a0b644689d946a1.tar.xz wireshark-a86c5f7cae7ec9a3398300555a0b644689d946a1.zip | |
Merging upstream version 4.4.0.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'ui/rtp_media.c')
| -rw-r--r-- | ui/rtp_media.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/ui/rtp_media.c b/ui/rtp_media.c index fe69c2df..e79f3a7f 100644 --- a/ui/rtp_media.c +++ b/ui/rtp_media.c @@ -36,9 +36,9 @@ typedef struct _rtp_decoder_t { */ size_t -decode_rtp_packet_payload(guint8 payload_type, const gchar *payload_type_str, int payload_rate, int payload_channels, wmem_map_t *payload_fmtp_map, guint8 *payload_data, size_t payload_len, SAMPLE **out_buff, GHashTable *decoders_hash, guint *channels_ptr, guint *sample_rate_ptr) +decode_rtp_packet_payload(uint8_t payload_type, const char *payload_type_str, int payload_rate, int payload_channels, wmem_map_t *payload_fmtp_map, uint8_t *payload_data, size_t payload_len, SAMPLE **out_buff, GHashTable *decoders_hash, unsigned *channels_ptr, unsigned *sample_rate_ptr) { - const gchar *p; + const char *p; rtp_decoder_t *decoder; SAMPLE *tmp_buff = NULL; size_t tmp_buff_len; @@ -96,9 +96,9 @@ decode_rtp_packet_payload(guint8 payload_type, const gchar *payload_type_str, in */ size_t -decode_rtp_packet(rtp_packet_t *rp, SAMPLE **out_buff, GHashTable *decoders_hash, guint *channels_ptr, guint *sample_rate_ptr) +decode_rtp_packet(rtp_packet_t *rp, SAMPLE **out_buff, GHashTable *decoders_hash, unsigned *channels_ptr, unsigned *sample_rate_ptr) { - guint8 payload_type; + uint8_t payload_type; if ((rp->payload_data == NULL) || (rp->info->info_payload_len == 0) ) { return 0; @@ -111,7 +111,7 @@ decode_rtp_packet(rtp_packet_t *rp, SAMPLE **out_buff, GHashTable *decoders_hash /****************************************************************************/ static void -rtp_decoder_value_destroy(gpointer dec_arg) +rtp_decoder_value_destroy(void *dec_arg) { rtp_decoder_t *dec = (rtp_decoder_t *)dec_arg; |