Merge commit 'origin/gallium-0.2' into gallium-xlib-rework

1 files changed, 8 insertions, 2 deletions

diff --git a/src/libXvMC/surface.c b/src/libXvMC/surface.c
index 6031b39d10..67c179e66d 100644
--- a/src/libXvMC/surface.c
+++ b/src/libXvMC/surface.c
@@ -261,8 +261,14 @@ Status XvMCPutSurface
 
 	assert(srcx + srcw - 1 < surface->width);
 	assert(srcy + srch - 1 < surface->height);
-	assert(destx + destw - 1 < width);
-	assert(desty + desth - 1 < height);
+	/* XXX: Some apps (mplayer) hit these asserts because they call
+	 * this function after the window has been resized by the WM
+	 * but before they've handled the corresponding XEvent and
+	 * know about the new dimensions. The output will be clipped
+	 * for a few frames until the app updates destw and desth.
+	 */
+	/*assert(destx + destw - 1 < width);
+	assert(desty + desth - 1 < height);*/
 
 	vl_sfc = surface->privData;