Title: [276709] releases/WebKitGTK/webkit-2.32/Source/WebCore
- Revision
- 276709
- Author
- [email protected]
- Date
- 2021-04-28 07:31:34 -0700 (Wed, 28 Apr 2021)
Log Message
Merge r275654 - Unreviewed. Fixed build warning.
* platform/graphics/gstreamer/eme/WebKitCommonEncryptionDecryptorGStreamer.h: Avoid C-linkage warning.
Modified Paths
Diff
Modified: releases/WebKitGTK/webkit-2.32/Source/WebCore/ChangeLog (276708 => 276709)
--- releases/WebKitGTK/webkit-2.32/Source/WebCore/ChangeLog 2021-04-28 14:31:25 UTC (rev 276708)
+++ releases/WebKitGTK/webkit-2.32/Source/WebCore/ChangeLog 2021-04-28 14:31:34 UTC (rev 276709)
@@ -1,3 +1,9 @@
+2021-04-08 Xabier Rodriguez Calvar <[email protected]>
+
+ Unreviewed. Fixed build warning.
+
+ * platform/graphics/gstreamer/eme/WebKitCommonEncryptionDecryptorGStreamer.h: Avoid C-linkage warning.
+
2021-04-07 Enrique Ocaña González <[email protected]>
[EME][GStreamer] Abort decryptor operations immediately and without errors on flush
Modified: releases/WebKitGTK/webkit-2.32/Source/WebCore/platform/graphics/gstreamer/eme/WebKitCommonEncryptionDecryptorGStreamer.h (276708 => 276709)
--- releases/WebKitGTK/webkit-2.32/Source/WebCore/platform/graphics/gstreamer/eme/WebKitCommonEncryptionDecryptorGStreamer.h 2021-04-28 14:31:25 UTC (rev 276708)
+++ releases/WebKitGTK/webkit-2.32/Source/WebCore/platform/graphics/gstreamer/eme/WebKitCommonEncryptionDecryptorGStreamer.h 2021-04-28 14:31:34 UTC (rev 276709)
@@ -47,7 +47,6 @@
GType webkit_media_common_encryption_decrypt_get_type(void);
bool webKitMediaCommonEncryptionDecryptIsFlushing(WebKitMediaCommonEncryptionDecrypt*);
-WeakPtr<WebCore::CDMProxyDecryptionClient> webKitMediaCommonEncryptionDecryptGetCDMProxyDecryptionClient(WebKitMediaCommonEncryptionDecrypt*);
struct _WebKitMediaCommonEncryptionDecrypt {
GstBaseTransform parent;
@@ -65,4 +64,8 @@
G_END_DECLS
+// This function returns a C++ type. It's internal to the decryptors so it is safe to move it here to avoid the C++ return warning because of the C only linkage
+// area.
+WeakPtr<WebCore::CDMProxyDecryptionClient> webKitMediaCommonEncryptionDecryptGetCDMProxyDecryptionClient(WebKitMediaCommonEncryptionDecrypt*);
+
#endif // ENABLE(ENCRYPTED_MEDIA) && USE(GSTREAMER)
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
