diff --git a/lib/native/windows-64/jndirectshow.dll b/lib/native/windows-64/jndirectshow.dll
index 638870bb322eba4b1972f03d8d3479c4fcad4c56..78ff7f90fa4736247aaf5ce9c3b178d44e8efe58 100644
Binary files a/lib/native/windows-64/jndirectshow.dll and b/lib/native/windows-64/jndirectshow.dll differ
diff --git a/lib/native/windows/jndirectshow.dll b/lib/native/windows/jndirectshow.dll
index 3e3f1d3d8c0364fca9ae8d89509786892deaf4b0..1266a10cdf4ab49ce83c741d606ab96c4f2295f4 100644
Binary files a/lib/native/windows/jndirectshow.dll and b/lib/native/windows/jndirectshow.dll differ
diff --git a/src/native/windows/directshow/org_jitsi_impl_neomedia_jmfext_media_protocol_directshow_DSFormat.cpp b/src/native/windows/directshow/org_jitsi_impl_neomedia_jmfext_media_protocol_directshow_DSFormat.cpp
index 2f860c9e1f4d14577d0d1b925dd385149d73e0af..b99bf3077465e0fac11d1903080774e9f7711871 100644
--- a/src/native/windows/directshow/org_jitsi_impl_neomedia_jmfext_media_protocol_directshow_DSFormat.cpp
+++ b/src/native/windows/directshow/org_jitsi_impl_neomedia_jmfext_media_protocol_directshow_DSFormat.cpp
@@ -28,6 +28,7 @@ DEFINE_DSFORMAT_PIXELFORMAT(IMC2)
 DEFINE_DSFORMAT_PIXELFORMAT(IMC3)
 DEFINE_DSFORMAT_PIXELFORMAT(IMC4)
 DEFINE_DSFORMAT_PIXELFORMAT(IYUV)
+DEFINE_DSFORMAT_PIXELFORMAT(MJPG)
 DEFINE_DSFORMAT_PIXELFORMAT(NV12)
 DEFINE_DSFORMAT_PIXELFORMAT(RGB24)
 DEFINE_DSFORMAT_PIXELFORMAT(RGB32)
@@ -39,4 +40,3 @@ DEFINE_DSFORMAT_PIXELFORMAT(YUY2)
 DEFINE_DSFORMAT_PIXELFORMAT(YV12)
 DEFINE_DSFORMAT_PIXELFORMAT(YVU9)
 DEFINE_DSFORMAT_PIXELFORMAT(YVYU)
-DEFINE_DSFORMAT_PIXELFORMAT(MJPG)
\ No newline at end of file
diff --git a/src/native/windows/directshow/org_jitsi_impl_neomedia_jmfext_media_protocol_directshow_DSFormat.h b/src/native/windows/directshow/org_jitsi_impl_neomedia_jmfext_media_protocol_directshow_DSFormat.h
index 67498c7eb425e2f0e59dbc811708104ad56a4ed7..7abdda3f527adca12718f9d317d5bd701ca3d970 100644
--- a/src/native/windows/directshow/org_jitsi_impl_neomedia_jmfext_media_protocol_directshow_DSFormat.h
+++ b/src/native/windows/directshow/org_jitsi_impl_neomedia_jmfext_media_protocol_directshow_DSFormat.h
@@ -77,6 +77,14 @@ JNIEXPORT jint JNICALL Java_org_jitsi_impl_neomedia_jmfext_media_protocol_direct
  * Signature: ()I
  */
 JNIEXPORT jint JNICALL Java_org_jitsi_impl_neomedia_jmfext_media_protocol_directshow_DSFormat_IYUV
+(JNIEnv *, jclass);
+
+/*
+* Class:     org_jitsi_impl_neomedia_jmfext_media_protocol_directshow_DSFormat
+* Method:    MJPG
+* Signature: ()I
+*/
+JNIEXPORT jint JNICALL Java_org_jitsi_impl_neomedia_jmfext_media_protocol_directshow_DSFormat_MJPG
   (JNIEnv *, jclass);
 
 /*
@@ -167,14 +175,6 @@ JNIEXPORT jint JNICALL Java_org_jitsi_impl_neomedia_jmfext_media_protocol_direct
 JNIEXPORT jint JNICALL Java_org_jitsi_impl_neomedia_jmfext_media_protocol_directshow_DSFormat_YVYU
   (JNIEnv *, jclass);
 
-/*
- * Class:     org_jitsi_impl_neomedia_jmfext_media_protocol_directshow_DSFormat
- * Method:    MJPG
- * Signature: ()I
- */
-JNIEXPORT jint JNICALL Java_org_jitsi_impl_neomedia_jmfext_media_protocol_directshow_DSFormat_MJPG
-  (JNIEnv *, jclass);
-
 #ifdef __cplusplus
 }
 #endif
diff --git a/src/org/jitsi/impl/neomedia/jmfext/media/protocol/directshow/DSFormat.java b/src/org/jitsi/impl/neomedia/jmfext/media/protocol/directshow/DSFormat.java
index 9663e7c50286d5e56114f857067d85aa82df427f..723c4bb63517756552603843088827447142ee58 100644
--- a/src/org/jitsi/impl/neomedia/jmfext/media/protocol/directshow/DSFormat.java
+++ b/src/org/jitsi/impl/neomedia/jmfext/media/protocol/directshow/DSFormat.java
@@ -71,16 +71,16 @@ public class DSFormat
     {
         System.loadLibrary("jndirectshow");
 
+        ARGB32 = ARGB32();
+        I420 = I420();
+        MJPG = MJPG();
+        NV12 = NV12();
         RGB24 = RGB24();
         RGB32 = RGB32();
-        ARGB32 = ARGB32();
-        YUY2 = YUY2();
         UYVY = UYVY();
-        NV12 = NV12();
         Y411 = Y411();
         Y41P = Y41P();
-        I420 = I420();
-        MJPG = MJPG();
+        YUY2 = YUY2();
     }
 
     private static native int ARGB32();
@@ -101,6 +101,8 @@ public class DSFormat
 
     public static native int IYUV();
 
+    private static native int MJPG();
+
     private static native int NV12();
 
     private static native int RGB24();
@@ -123,8 +125,6 @@ public class DSFormat
 
     public static native int YVYU();
 
-    public static native int MJPG();
-
     /**
      * Video height.
      */