From 98efddc6c26313809b6f9326f09f76c390d21676 Mon Sep 17 00:00:00 2001
From: Peter Wu <peter@lekensteyn.nl>
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 <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
---
 wireshark-qt.cpp | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

(limited to 'wireshark-qt.cpp')

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
-- 
cgit v1.2.3