diff options
| author | Peter Wu <peter@lekensteyn.nl> | 2016-11-29 00:53:23 +0100 |
|---|---|---|
| committer | Peter Wu <peter@lekensteyn.nl> | 2016-12-04 17:29:11 +0000 |
| commit | 98efddc6c26313809b6f9326f09f76c390d21676 (patch) | |
| tree | 2a07a7cceb05922822943a6add98802b46cb7e22 /codecs/codecs.c | |
| parent | 054455683b2e3697a0e41640a7137781cdc754c8 (diff) | |
codecs: allow it to be used without plugins
Not all codecs require the plugin infrastructure. For example, G.711U/A
is a built-in codec. Allow such functionality to be registered even if
plugin support is disabled.
Change-Id: I2505cc9955e7953268ec0739531278921f70a771
Reviewed-on: https://code.wireshark.org/review/18977
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
Diffstat (limited to 'codecs/codecs.c')
| -rw-r--r-- | codecs/codecs.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/codecs/codecs.c b/codecs/codecs.c index 7f628a7043..e8987bd447 100644 --- a/codecs/codecs.c +++ b/codecs/codecs.c @@ -92,6 +92,7 @@ register_codec_plugin(gpointer data, gpointer user_data _U_) (plugin->register_codec_module)(); } +#endif /* HAVE_PLUGINS */ /* @@ -115,9 +116,11 @@ register_all_codecs(void) codec_sbc_get_channels, codec_sbc_get_frequency, codec_sbc_decode); #endif +#ifdef HAVE_PLUGINS g_slist_foreach(codec_plugins, register_codec_plugin, NULL); -} #endif /* HAVE_PLUGINS */ +} + struct codec_handle { const char *name; |