Browse Source

compile fix for with_transcoding=no option

fixes #568

Change-Id: I97fba6bb767a572d6b701e274176913270e55f16
changes/72/22172/1
Richard Fuchs 8 years ago
parent
commit
4eb80da836
2 changed files with 19 additions and 17 deletions
  1. +17
    -16
      daemon/codec.c
  2. +2
    -1
      include/codec.h

+ 17
- 16
daemon/codec.c View File

@ -29,6 +29,23 @@ static struct codec_handler codec_handler_stub = {
static GList *__delete_x_codec(GList *link, GHashTable *codecs, GHashTable *codec_names, GQueue *codecs_prefs) {
struct rtp_payload_type *pt = link->data;
g_hash_table_remove(codecs, &pt->payload_type);
g_hash_table_remove(codec_names, &pt->encoding);
g_hash_table_remove(codec_names, &pt->encoding_with_params);
GList *next = link->next;
g_queue_delete_link(codecs_prefs, link);
payload_type_free(pt);
return next;
}
static GList *__delete_receiver_codec(struct call_media *receiver, GList *link) {
return __delete_x_codec(link, receiver->codecs_recv, receiver->codec_names_recv,
&receiver->codecs_prefs_recv);
}
#ifdef WITH_TRANSCODING
@ -146,22 +163,6 @@ static void __ensure_codec_def(struct rtp_payload_type *pt, struct call_media *m
pt->codec_def = NULL;
}
static GList *__delete_x_codec(GList *link, GHashTable *codecs, GHashTable *codec_names, GQueue *codecs_prefs) {
struct rtp_payload_type *pt = link->data;
g_hash_table_remove(codecs, &pt->payload_type);
g_hash_table_remove(codec_names, &pt->encoding);
g_hash_table_remove(codec_names, &pt->encoding_with_params);
GList *next = link->next;
g_queue_delete_link(codecs_prefs, link);
payload_type_free(pt);
return next;
}
static GList *__delete_receiver_codec(struct call_media *receiver, GList *link) {
return __delete_x_codec(link, receiver->codecs_recv, receiver->codec_names_recv,
&receiver->codecs_prefs_recv);
}
static GList *__delete_send_codec(struct call_media *sender, GList *link) {
return __delete_x_codec(link, sender->codecs_send, sender->codec_names_send,
&sender->codecs_prefs_send);


+ 2
- 1
include/codec.h View File

@ -59,7 +59,8 @@ void codec_handlers_update(struct call_media *receiver, struct call_media *sink,
#else
INLINE void codec_handlers_update(struct call_media *receiver, struct call_media *sink) { }
INLINE void codec_handlers_update(struct call_media *receiver, struct call_media *sink,
const struct sdp_ng_flags *flags) { }
#endif


Loading…
Cancel
Save