From 98efddc6c26313809b6f9326f09f76c390d21676 Mon Sep 17 00:00:00 2001 From: Peter Wu Date: Tue, 29 Nov 2016 00:53:23 +0100 Subject: 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 Tested-by: Petri Dish Buildbot Reviewed-by: Peter Wu --- codecs/codecs.c | 5 ++++- codecs/codecs.h | 6 +++++- 2 files changed, 9 insertions(+), 2 deletions(-) (limited to 'codecs') 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; diff --git a/codecs/codecs.h b/codecs/codecs.h index 9f0c971bd5..8825d9e685 100644 --- a/codecs/codecs.h +++ b/codecs/codecs.h @@ -34,9 +34,13 @@ extern "C" { #ifdef HAVE_PLUGINS WS_DLL_PUBLIC void codec_register_plugin_types(void); -WS_DLL_PUBLIC void register_all_codecs(void); #endif +/** + * For all built-in codecs and codec plugins, call their register routines. + */ +WS_DLL_PUBLIC void register_all_codecs(void); + struct codec_handle; typedef struct codec_handle *codec_handle_t; -- cgit v1.2.1