Rebase against 5e6f35ffbd8795da71c6fd6cb8adc84bf8a36504.

[fontsub-CreateFontPackage]
Removed patch to improve fontsub.CreateFontPackage stub implementation
(accepted upstream).

[quartz-AsyncReader]
Removed patch to improve detection of MPEG2 streams (accepted upstream).

[user32-SetCoalescableTimer]
Removed patch to add stub for SetCoalescableTimer (implemented upstream).
This commit is contained in:
Sebastian Lackner
2016-04-29 21:07:34 +02:00
parent 72a52e44c2
commit 8d2cdec699
11 changed files with 29 additions and 247 deletions

View File

@@ -1,28 +0,0 @@
From 6db27add885e521e7b42829ade2f7de74abdd619 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
Date: Sun, 7 Feb 2016 01:32:04 +0100
Subject: quartz: Recognize mpeg2 program streams.
---
dlls/quartz/regsvr.c | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/dlls/quartz/regsvr.c b/dlls/quartz/regsvr.c
index b0f1e9a..196e064 100644
--- a/dlls/quartz/regsvr.c
+++ b/dlls/quartz/regsvr.c
@@ -818,6 +818,11 @@ static struct regsvr_mediatype_parsing const mediatype_parsing_list[] = {
"0, 10, FFFFFF00000080808080, 494433000000000000",
NULL }
},
+ { &MEDIATYPE_Stream,
+ &MEDIASUBTYPE_MPEG2_PROGRAM,
+ { "0, 5, FFFFFFFFC0, 000001BA40",
+ NULL }
+ },
{ &MEDIATYPE_Stream,
&MEDIASUBTYPE_QTMovie,
{ "4, 4, , 6d646174",
--
2.7.0

View File

@@ -1 +0,0 @@
Fixes: Improve detection of MPEG2 streams