d588620e70bf15da29cc242e4ae8d86977e8f36a from master; fix hang if you cancel a paused...

[dcpomatic.git] / TO_PORT

diff --git a/TO_PORT b/TO_PORT
index a4e9ef00a90941573f39c0afd2ea2144a71830ab..b97043bb1fa9ac2b6f92fec4bbc34a740c711f30 100644 (file)
--- a/TO_PORT
+++ b/TO_PORT
@@ -1,16 +1,8 @@
-4bcdf16458e460dd4a78d634dfe69f2a44182541
-21f33acd3580c6e5c4ec1e7449b419c3178aa8ab
-Multi-stream audio stuff.
-681d95c83868310330984ae65589a1021bbe07d6
+33a2bece96b7875134c99a2053a2fc59e828ae33
+b41b6528fbe0d270415a8500a612da19469e49e4
+c040b70eb777630ef0fdbb80cd419f6b3da4b46e
+ea2becf3a859bc38c783d15f165d71f2ccb8c1d6
 21cb435ed5eb250a7f94887ddd75f6b367ea231f
-c7ec9dee8aa03ca86564d13f239dce0e498dc4bd
-823dc6064795fd128bcb2f0229202d507e289324
-994df155c9d1f6256cdcf51c355a74ebad24288b
-ccb883a479cb341c686fc4237763f483d15e1ec5
-8e5f3e2d989a119f41ba4c69434545c0929e92e0
-468a7437c8ec82a8f74ae30197a2c5b04100b75d
-2bf46f7c75c59e4cd3d91f1ddd322bdabb19b6f4
+Multi-stream audio stuff.
 f952568be9c4438d5b024c133b18b2590de968e7
-349e2950e5541d41e5491c2865734cf6a86e2cbd
-dd843f32f8f915a2fe984126ac338b26fa83546d
-c13575f0483d6e92956fa7fb2e424572702236dc
+77d7a03cf0785140caf37276edac9a1a0c9a8799