4 files changed, 11 insertions, 10 deletions
diff --git a/src/net/java/sip/communicator/impl/gui/main/account/AccountsConfigurationPanel.java b/src/net/java/sip/communicator/impl/gui/main/account/AccountsConfigurationPanel.java
index f605ef7..2acc27e 100644
--- a/src/net/java/sip/communicator/impl/gui/main/account/AccountsConfigurationPanel.java
+++ b/src/net/java/sip/communicator/impl/gui/main/account/AccountsConfigurationPanel.java
@@ -14,7 +14,6 @@ import javax.swing.*;
 import javax.swing.event.*;
 
 import net.java.sip.communicator.impl.gui.*;
-import net.java.sip.communicator.impl.gui.utils.*;
 import net.java.sip.communicator.service.configuration.*;
 import net.java.sip.communicator.service.gui.*;
 import net.java.sip.communicator.service.protocol.*;
diff --git a/src/net/java/sip/communicator/impl/neomedia/codec/EncodingConfiguration.java b/src/net/java/sip/communicator/impl/neomedia/codec/EncodingConfiguration.java
index aff2a35..587e5e1 100644
--- a/src/net/java/sip/communicator/impl/neomedia/codec/EncodingConfiguration.java
+++ b/src/net/java/sip/communicator/impl/neomedia/codec/EncodingConfiguration.java
@@ -426,7 +426,7 @@ public class EncodingConfiguration
                 "com.sun.media.codec.video.colorspace.RGBScaler",
                 PlugInManager.CODEC);
 
-        /* remove JMF's H263 codec */
+        // Remove JMF's H263 codec.
         PlugInManager.removePlugIn(
                 "com.sun.media.codec.video.vh263.NativeDecoder",
                 PlugInManager.CODEC);
@@ -434,6 +434,14 @@ public class EncodingConfiguration
                 "com.ibm.media.codec.video.h263.NativeEncoder",
                 PlugInManager.CODEC);
 
+        /*
+         * Remove FMJ's JavaSoundCodec because it seems to slow down the
+         * building of the filter graph and we do not currently seem to need it.
+         */
+        PlugInManager.removePlugIn(
+                "net.sf.fmj.media.codec.JavaSoundCodec",
+                PlugInManager.CODEC);
+
         for (String className : CUSTOM_CODECS)
         {
 
diff --git a/src/net/java/sip/communicator/impl/neomedia/codec/audio/alaw/Packetizer.java b/src/net/java/sip/communicator/impl/neomedia/codec/audio/alaw/Packetizer.java
index 96cd8bc..7e163b9 100644
--- a/src/net/java/sip/communicator/impl/neomedia/codec/audio/alaw/Packetizer.java
+++ b/src/net/java/sip/communicator/impl/neomedia/codec/audio/alaw/Packetizer.java
@@ -10,6 +10,7 @@ import javax.media.*;
 import javax.media.format.*;
 
 import com.ibm.media.codec.audio.*;
+
 import net.java.sip.communicator.impl.neomedia.codec.*;
 
 /**
@@ -134,21 +135,15 @@ class PacketSizeAdapter
 
     public int setPacketSize(int numBytes)
     {
-
         int numOfPackets = numBytes;
 
         if (numOfPackets < 10)
-        {
             numOfPackets = 10;
-        }
-
         if (numOfPackets > 8000)
-        {
             numOfPackets = 8000;
-        }
         packetSize = numOfPackets;
 
-        ( (Packetizer) owner).setPacketSize(packetSize);
+        ((Packetizer)owner).setPacketSize(packetSize);
 
         return packetSize;
     }
diff --git a/src/net/java/sip/communicator/plugin/jabberaccregwizz/JabberAccRegWizzActivator.java b/src/net/java/sip/communicator/plugin/jabberaccregwizz/JabberAccRegWizzActivator.java
index 945a616..6b26669 100644
--- a/src/net/java/sip/communicator/plugin/jabberaccregwizz/JabberAccRegWizzActivator.java
+++ b/src/net/java/sip/communicator/plugin/jabberaccregwizz/JabberAccRegWizzActivator.java
@@ -10,7 +10,6 @@ import java.util.*;
 
 import org.osgi.framework.*;
 
-import net.java.sip.communicator.impl.gui.*;
 import net.java.sip.communicator.service.browserlauncher.*;
 import net.java.sip.communicator.service.configuration.*;
 import net.java.sip.communicator.service.credentialsstorage.*;