Title: [279196] branches/safari-611.3.10.1-branch/Source/ThirdParty/libwebrtc/Source/webrtc/sdk/WebKit
- Revision
- 279196
- Author
- [email protected]
- Date
- 2021-06-23 16:36:41 -0700 (Wed, 23 Jun 2021)
Log Message
Unreviewed build fix. rdar://problem/79474211
Sources/libwebrtc/Source/webrtc/sdk/WebKit/WebKitVP9Decoder.cpp:82:5: error: static_assert failed due to requirement 'sizeof (WebKitVP9Decoder_BaseClass.alignedClass.version) == sizeof(unsigned long)' CMBaseClass fixup is not required
Modified Paths
Diff
Modified: branches/safari-611.3.10.1-branch/Source/ThirdParty/libwebrtc/Source/webrtc/sdk/WebKit/WebKitDecoder.h (279195 => 279196)
--- branches/safari-611.3.10.1-branch/Source/ThirdParty/libwebrtc/Source/webrtc/sdk/WebKit/WebKitDecoder.h 2021-06-23 23:00:51 UTC (rev 279195)
+++ branches/safari-611.3.10.1-branch/Source/ThirdParty/libwebrtc/Source/webrtc/sdk/WebKit/WebKitDecoder.h 2021-06-23 23:36:41 UTC (rev 279196)
@@ -34,12 +34,6 @@
namespace webrtc {
-#if (TARGET_OS_OSX || TARGET_OS_MACCATALYST) && TARGET_CPU_X86_64
- #define CMBASE_OBJECT_NEEDS_ALIGNMENT 1
-#else
- #define CMBASE_OBJECT_NEEDS_ALIGNMENT 0
-#endif
-
struct SdpVideoFormat;
class VideoDecoderFactory;
Modified: branches/safari-611.3.10.1-branch/Source/ThirdParty/libwebrtc/Source/webrtc/sdk/WebKit/WebKitVP8Decoder.cpp (279195 => 279196)
--- branches/safari-611.3.10.1-branch/Source/ThirdParty/libwebrtc/Source/webrtc/sdk/WebKit/WebKitVP8Decoder.cpp 2021-06-23 23:00:51 UTC (rev 279195)
+++ branches/safari-611.3.10.1-branch/Source/ThirdParty/libwebrtc/Source/webrtc/sdk/WebKit/WebKitVP8Decoder.cpp 2021-06-23 23:36:41 UTC (rev 279196)
@@ -47,6 +47,12 @@
static void finalizeVP8Decoder(CMBaseObjectRef);
static CFStringRef copyVP8DecoderDebugDescription(CMBaseObjectRef);
+#if (TARGET_OS_OSX || TARGET_OS_MACCATALYST) && TARGET_CPU_X86_64
+ #define CMBASE_OBJECT_NEEDS_ALIGNMENT 1
+#else
+ #define CMBASE_OBJECT_NEEDS_ALIGNMENT 0
+#endif
+
#if defined(CMBASE_OBJECT_NEEDS_ALIGNMENT) && CMBASE_OBJECT_NEEDS_ALIGNMENT
constexpr size_t padSize = 4;
#else
Modified: branches/safari-611.3.10.1-branch/Source/ThirdParty/libwebrtc/Source/webrtc/sdk/WebKit/WebKitVP9Decoder.cpp (279195 => 279196)
--- branches/safari-611.3.10.1-branch/Source/ThirdParty/libwebrtc/Source/webrtc/sdk/WebKit/WebKitVP9Decoder.cpp 2021-06-23 23:00:51 UTC (rev 279195)
+++ branches/safari-611.3.10.1-branch/Source/ThirdParty/libwebrtc/Source/webrtc/sdk/WebKit/WebKitVP9Decoder.cpp 2021-06-23 23:36:41 UTC (rev 279196)
@@ -47,6 +47,12 @@
static void finalizeVP9Decoder(CMBaseObjectRef);
static CFStringRef copyVP9DecoderDebugDescription(CMBaseObjectRef);
+#if (TARGET_OS_OSX || TARGET_OS_MACCATALYST) && TARGET_CPU_X86_64
+ #define CMBASE_OBJECT_NEEDS_ALIGNMENT 1
+#else
+ #define CMBASE_OBJECT_NEEDS_ALIGNMENT 0
+#endif
+
#if defined(CMBASE_OBJECT_NEEDS_ALIGNMENT) && CMBASE_OBJECT_NEEDS_ALIGNMENT
constexpr size_t padSize = 4;
#else
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
