diff -uNrp x264vfw.svn.30/codec.c x264vfw.svn/codec.c
--- x264vfw.svn.30/codec.c	2011-03-02 14:01:49 +0200
+++ x264vfw.svn/codec.c	2011-03-09 11:28:47 +0200
@@ -297,11 +297,6 @@ LRESULT compress_query(CODEC *codec, BIT
     if (!supported_fourcc(outhdr->biCompression))
         return ICERR_BADFORMAT;
 
-    /* MSDN says that biSizeImage may be set to zero for BI_RGB bitmaps
-       But some buggy applications don't set it also for other bitmap types */
-    if (outhdr->biSizeImage != 0 && outhdr->biSizeImage < compress_get_size(codec, lpbiInput, lpbiOutput))
-        return ICERR_BADFORMAT;
-
     return ICERR_OK;
 }
 
@@ -1426,7 +1421,11 @@ LRESULT compress(CODEC *codec, ICCOMPRES
     }
 
 #if X264VFW_USE_VIRTUALDUB_HACK
-    if (codec->b_use_vd_hack && !got_picture)
+#if X264VFW_USE_BUGGY_APPS_HACK
+    if (codec->b_use_vd_hack && !got_picture && (outhdr->biSizeImage > 0 || !codec->b_check_size))
+#else
+    if (codec->b_use_vd_hack && !got_picture && outhdr->biSizeImage > 0)
+#endif
     {
         *icc->lpdwFlags = 0;
         ((uint8_t *)icc->lpOutput)[0] = 0x7f;
diff -uNrp x264vfw.svn.30/installer/x264vfw.nsi x264vfw.svn/installer/x264vfw.nsi
--- x264vfw.svn.30/installer/x264vfw.nsi	2011-01-18 18:04:49 +0200
+++ x264vfw.svn/installer/x264vfw.nsi	2011-03-09 11:28:47 +0200
@@ -164,11 +164,14 @@ Section "Uninstall"
   DeleteRegKey HKCU "Software\GNU\x264"
 keep_settings:
 
-  ReadRegStr $R0 HKLM "Software\Microsoft\Windows NT\CurrentVersion\drivers32" "vidc.x264"
-  DeleteRegValue HKLM "Software\Microsoft\Windows NT\CurrentVersion\drivers.desc" $R0
-  DeleteRegValue HKLM "Software\Microsoft\Windows NT\CurrentVersion\drivers32" "vidc.x264"
-  DeleteINIStr "$WINDIR\system.ini" "drivers32" "vidc.x264"
-  DeleteRegKey HKLM "System\CurrentControlSet\Control\MediaResources\icm\vidc.x264"
+  ${If} ${IsNT}
+    ReadRegStr $R0 HKLM "Software\Microsoft\Windows NT\CurrentVersion\drivers32" "vidc.x264"
+    DeleteRegValue HKLM "Software\Microsoft\Windows NT\CurrentVersion\drivers.desc" $R0
+    DeleteRegValue HKLM "Software\Microsoft\Windows NT\CurrentVersion\drivers32" "vidc.x264"
+  ${Else}
+    DeleteINIStr "$WINDIR\system.ini" "drivers32" "vidc.x264"
+    DeleteRegKey HKLM "System\CurrentControlSet\Control\MediaResources\icm\vidc.x264"
+  ${EndIf}
 
   Delete /REBOOTOK "$INSTDIR\x264vfw.dll"
   Delete /REBOOTOK "$INSTDIR\x264vfw.ico"
diff -uNrp x264vfw.svn.30/installer/x264vfw64.nsi x264vfw.svn/installer/x264vfw64.nsi
--- x264vfw.svn.30/installer/x264vfw64.nsi	2011-01-18 18:04:49 +0200
+++ x264vfw.svn/installer/x264vfw64.nsi	2011-03-09 11:28:47 +0200
@@ -172,11 +172,14 @@ Section "Uninstall"
   DeleteRegKey HKCU "Software\GNU\x264vfw64"
 keep_settings:
 
-  ReadRegStr $R0 HKLM "Software\Microsoft\Windows NT\CurrentVersion\drivers32" "vidc.x264"
-  DeleteRegValue HKLM "Software\Microsoft\Windows NT\CurrentVersion\drivers.desc" $R0
-  DeleteRegValue HKLM "Software\Microsoft\Windows NT\CurrentVersion\drivers32" "vidc.x264"
-  DeleteINIStr "$WINDIR\system.ini" "drivers32" "vidc.x264"
-  DeleteRegKey HKLM "System\CurrentControlSet\Control\MediaResources\icm\vidc.x264"
+  ${If} ${IsNT}
+    ReadRegStr $R0 HKLM "Software\Microsoft\Windows NT\CurrentVersion\drivers32" "vidc.x264"
+    DeleteRegValue HKLM "Software\Microsoft\Windows NT\CurrentVersion\drivers.desc" $R0
+    DeleteRegValue HKLM "Software\Microsoft\Windows NT\CurrentVersion\drivers32" "vidc.x264"
+  ${Else}
+    DeleteINIStr "$WINDIR\system.ini" "drivers32" "vidc.x264"
+    DeleteRegKey HKLM "System\CurrentControlSet\Control\MediaResources\icm\vidc.x264"
+  ${EndIf}
 
   SetRegView lastused