Index: hw/xfree86/common/xf86xv.c
===================================================================
--- hw/xfree86/common/xf86xv.c	(revision 1935)
+++ hw/xfree86/common/xf86xv.c	(working copy)
@@ -1737,9 +1737,15 @@
      REGION_UNINIT(pScreen, &VPReg);
   }
 
+/* XXX: 
+ *  * Commenting this out because we don't use this feature and it it causing 
+ *   * the Xorg server to crash when executing Xv[Shm]PutImage on a second execution.
+ *    */
+#if 0
   /* If we are changing windows, unregister our port in the old window */
   if(portPriv->pDraw && (portPriv->pDraw != pDraw))
      xf86XVRemovePortFromWindow((WindowPtr)(portPriv->pDraw), portPriv);
+#endif
 
   /* Register our port with the new window */
   ret =  xf86XVEnlistPortInWindow((WindowPtr)pDraw, portPriv);