Mercurial > pidgin
comparison src/media.c @ 12215:31b91bfab029
[gaim-migrate @ 14517]
make this stuff compile without iLBC. Really I want to rip out anything
that references iLBC, but I don't know exactly how optional it is or if I'd
get shot for doing that.
committer: Tailor Script <tailor@pidgin.im>
author | Stu Tomlinson <stu@nosnilmot.com> |
---|---|
date | Thu, 24 Nov 2005 20:38:24 +0000 |
parents | 90d7e0f342fa |
children | b81a7d1422d8 |
comparison
equal
deleted
inserted
replaced
12214:cadda0024205 | 12215:31b91bfab029 |
---|---|
27 | 27 |
28 #ifdef HAVE_VV | 28 #ifdef HAVE_VV |
29 | 29 |
30 #include "media.h" | 30 #include "media.h" |
31 #include "mediastream.h" | 31 #include "mediastream.h" |
32 #ifdef HAVE_ILBC | |
32 #include "msilbcdec.h" | 33 #include "msilbcdec.h" |
34 #endif | |
33 | 35 |
34 | 36 |
35 /* msrtpsend.o and msrtprecv.o aren't used within the core, so | 37 /* msrtpsend.o and msrtprecv.o aren't used within the core, so |
36 * the linker chooses not to link them. I want plugins to be able | 38 * the linker chooses not to link them. I want plugins to be able |
37 * to depend on them, so I reference symbols from them here. */ | 39 * to depend on them, so I reference symbols from them here. */ |
55 static GaimMediaUiOps *media_ui_ops = NULL; | 57 static GaimMediaUiOps *media_ui_ops = NULL; |
56 | 58 |
57 void gaim_media_init() | 59 void gaim_media_init() |
58 { | 60 { |
59 ms_init(); | 61 ms_init(); |
62 #ifdef HAVE_ILBC | |
60 ms_ilbc_codec_init(); | 63 ms_ilbc_codec_init(); |
64 #endif | |
61 ms_speex_codec_init(); | 65 ms_speex_codec_init(); |
62 ortp_init(); | 66 ortp_init(); |
63 } | 67 } |
64 | 68 |
65 GaimVoiceChat *gaim_voice_chat_new(GaimConnection *gc, const char *name) | 69 GaimVoiceChat *gaim_voice_chat_new(GaimConnection *gc, const char *name) |