Title: [276710] releases/WebKitGTK/webkit-2.32/Source/WebCore
- Revision
- 276710
- Author
- [email protected]
- Date
- 2021-04-28 07:31:40 -0700 (Wed, 28 Apr 2021)
Log Message
Merge r275757 - Unreviewed, GStreamer Thunder decryptor build fix after r275599
* platform/graphics/gstreamer/eme/WebKitThunderDecryptorGStreamer.cpp:
(decrypt):
Modified Paths
Diff
Modified: releases/WebKitGTK/webkit-2.32/Source/WebCore/ChangeLog (276709 => 276710)
--- releases/WebKitGTK/webkit-2.32/Source/WebCore/ChangeLog 2021-04-28 14:31:34 UTC (rev 276709)
+++ releases/WebKitGTK/webkit-2.32/Source/WebCore/ChangeLog 2021-04-28 14:31:40 UTC (rev 276710)
@@ -1,3 +1,10 @@
+2021-04-09 Philippe Normand <[email protected]>
+
+ Unreviewed, GStreamer Thunder decryptor build fix after r275599
+
+ * platform/graphics/gstreamer/eme/WebKitThunderDecryptorGStreamer.cpp:
+ (decrypt):
+
2021-04-08 Xabier Rodriguez Calvar <[email protected]>
Unreviewed. Fixed build warning.
Modified: releases/WebKitGTK/webkit-2.32/Source/WebCore/platform/graphics/gstreamer/eme/WebKitThunderDecryptorGStreamer.cpp (276709 => 276710)
--- releases/WebKitGTK/webkit-2.32/Source/WebCore/platform/graphics/gstreamer/eme/WebKitThunderDecryptorGStreamer.cpp 2021-04-28 14:31:34 UTC (rev 276709)
+++ releases/WebKitGTK/webkit-2.32/Source/WebCore/platform/graphics/gstreamer/eme/WebKitThunderDecryptorGStreamer.cpp 2021-04-28 14:31:40 UTC (rev 276710)
@@ -162,7 +162,7 @@
context.dataBuffer = buffer;
context.numSubsamples = subsampleCount;
context.subsamplesBuffer = subsampleCount ? subsamplesBuffer : nullptr;
- context.cdmProxyDecryptionClient = webKitMediaCommonEncryptionDecryptGetCDMProxyDecryptionClient(self);
+ context.cdmProxyDecryptionClient = webKitMediaCommonEncryptionDecryptGetCDMProxyDecryptionClient(decryptor);
bool result = priv->cdmProxy->decrypt(context);
return result;
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
