diff --git a/ChangeLog b/ChangeLog
index 0116a91..5b25d3b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,7 @@
 User johns
 Date:
 
+    Disabled old code before removement.
     Handle change of audio ac3 downmix direct.
     Speedup queuing output surface, when decoder buffers are full.
     Fix bug: info shows wrong decoded video surfaces.
diff --git a/video.c b/video.c
index c7fd65a..35b56bf 100644
--- a/video.c
+++ b/video.c
@@ -9003,16 +9003,20 @@ static void VdpauSyncRenderFrame(VdpauDecoder * decoder,
 	}
 	return;
     }
+#if 1
     // if video output buffer is full, wait and display surface.
     // loop for interlace
-    // FIXME: wrong for multiple streams
-#ifdef DEBUG
     if (atomic_read(&decoder->SurfacesFilled) >= VIDEO_SURFACES_MAX) {
-	Debug(3, "video/vdpau: this code part shouldn't be used\n");
-    }
+#ifdef DEBUG
+	Fatal("video/vdpau: this code part shouldn't be used\n");
+#else
+	Info("video/vdpau: this code part shouldn't be used\n");
 #endif
-
-#if 1
+	return;
+    }
+#else
+    // FIXME: disabled for remove
+    // FIXME: wrong for multiple streams
     // FIXME: this part code should be no longer be needed with new mpeg fix
     while (atomic_read(&decoder->SurfacesFilled) >= VIDEO_SURFACES_MAX) {
 	struct timespec abstime;