diff --git a/src/org/jitsi/impl/neomedia/codec/FMJPlugInConfiguration.java b/src/org/jitsi/impl/neomedia/codec/FMJPlugInConfiguration.java
index 576f6d0aafc6d8527545ad6d8a40147269325add..a1b63eac4bfba532f815a5b2cbf0fa26e764a14a 100644
--- a/src/org/jitsi/impl/neomedia/codec/FMJPlugInConfiguration.java
+++ b/src/org/jitsi/impl/neomedia/codec/FMJPlugInConfiguration.java
@@ -76,8 +76,8 @@ public class FMJPlugInConfiguration
                     "org.jitsi.impl.neomedia.codec.video.SwScaler",
                     "org.jitsi.impl.neomedia.codec.video.vp8.Packetizer",
                     "org.jitsi.impl.neomedia.codec.video.vp8.DePacketizer",
-                    "org.jitsi.impl.neomedia.codec.video.vp8.JNIEncoder",
-                    "org.jitsi.impl.neomedia.codec.video.vp8.JNIDecoder"
+                    "org.jitsi.impl.neomedia.codec.video.vp8.VPXEncoder",
+                    "org.jitsi.impl.neomedia.codec.video.vp8.VPXDecoder"
             };
 
     /**
diff --git a/src/org/jitsi/impl/neomedia/codec/video/vp8/Packetizer.java b/src/org/jitsi/impl/neomedia/codec/video/vp8/Packetizer.java
index fb4a4de56133ccab8c50a7d78779170d649aa3e0..3b9b3430ca60f0069c65f8585c7c7f37f356aa71 100644
--- a/src/org/jitsi/impl/neomedia/codec/video/vp8/Packetizer.java
+++ b/src/org/jitsi/impl/neomedia/codec/video/vp8/Packetizer.java
@@ -88,25 +88,14 @@ protected int doProcess(Buffer inputBuffer, Buffer outputBuffer)
         }
         byte[] output;
         int offset;
-        boolean haveToCopy = true;
         final int pdMaxLen = DePacketizer.VP8PayloadDescriptor.MAX_LENGTH;
 
         //The input will fit in a single packet
         if(inputBuffer.getLength() <= MAX_SIZE)
         {
-            //see if we can reuse the input buffer
-            if(inputBuffer.getOffset() >= pdMaxLen)
-            {
-                output = (byte[]) inputBuffer.getData();
-                offset = inputBuffer.getOffset();
-                haveToCopy = false;
-            }
-            else
-            {
-                output = validateByteArraySize(outputBuffer,
-                        inputBuffer.getLength() + pdMaxLen);
-                offset = pdMaxLen;
-            }
+            output = validateByteArraySize(outputBuffer,
+                                           inputBuffer.getLength() + pdMaxLen);
+            offset = pdMaxLen;
         }
         else
         {
@@ -117,14 +106,12 @@ protected int doProcess(Buffer inputBuffer, Buffer outputBuffer)
         int len = inputBuffer.getLength() <= MAX_SIZE
                     ? inputBuffer.getLength()
                     : MAX_SIZE;
-        if(haveToCopy)
-        {
-            System.arraycopy((byte[])inputBuffer.getData(),
-                                inputBuffer.getOffset(),
-                                output,
-                                offset,
-                                len);
-        }
+
+        System.arraycopy((byte[])inputBuffer.getData(),
+                         inputBuffer.getOffset(),
+                         output,
+                         offset,
+                         len);
 
         //get the payload descriptor and copy it to the output
         byte[] pd = DePacketizer.VP8PayloadDescriptor.create(firstPacket);