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 /wireshark-qt.cpp | |
| parent | 054455683b2e3697a0e41640a7137781cdc754c8 (diff) | |
| download | wireshark-98efddc6c26313809b6f9326f09f76c390d21676.tar.gz | |
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 'wireshark-qt.cpp')
| -rw-r--r-- | wireshark-qt.cpp | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/wireshark-qt.cpp b/wireshark-qt.cpp index fabd09f469..3fa5fad9f9 100644 --- a/wireshark-qt.cpp +++ b/wireshark-qt.cpp @@ -63,9 +63,7 @@ #include <epan/dissectors/packet-kerberos.h> #endif -#ifdef HAVE_PLUGINS #include <codecs/codecs.h> -#endif #ifdef HAVE_EXTCAP #include <extcap.h> @@ -551,10 +549,10 @@ int main(int argc, char *qt_argv[]) /* Register all libwiretap plugin modules. */ register_all_wiretap_modules(); +#endif /* Register all audio codec plugins. */ register_all_codecs(); -#endif /* Register all dissectors; we must do this before checking for the "-G" flag, as the "-G" flag dumps information registered by the |