Title: [227699] tags/Safari-605.1.25.1/Source/ThirdParty/libwebrtc
- Revision
- 227699
- Author
- [email protected]
- Date
- 2018-01-26 15:44:09 -0800 (Fri, 26 Jan 2018)
Log Message
Cherry-pick r227698. rdar://problem/36926420
Modified Paths
Diff
Modified: tags/Safari-605.1.25.1/Source/ThirdParty/libwebrtc/ChangeLog (227698 => 227699)
--- tags/Safari-605.1.25.1/Source/ThirdParty/libwebrtc/ChangeLog 2018-01-26 22:37:24 UTC (rev 227698)
+++ tags/Safari-605.1.25.1/Source/ThirdParty/libwebrtc/ChangeLog 2018-01-26 23:44:09 UTC (rev 227699)
@@ -1,3 +1,17 @@
+2018-01-26 Jason Marcell <[email protected]>
+
+ Cherry-pick r227698. rdar://problem/36926420
+
+ 2018-01-26 Youenn Fablet <[email protected]>
+
+ Disable VCP for MacOS
+ https://bugs.webkit.org/show_bug.cgi?id=182183
+ <rdar://problem/36919791>
+
+ Reviewed by Eric Carlson.
+
+ * Source/webrtc/sdk/objc/Framework/Classes/VideoProcessing/VideoProcessingSoftLink.h:
+
2018-01-22 Jason Marcell <[email protected]>
Cherry-pick r227226. rdar://problem/36722612
Modified: tags/Safari-605.1.25.1/Source/ThirdParty/libwebrtc/Source/webrtc/sdk/objc/Framework/Classes/VideoProcessing/VideoProcessingSoftLink.h (227698 => 227699)
--- tags/Safari-605.1.25.1/Source/ThirdParty/libwebrtc/Source/webrtc/sdk/objc/Framework/Classes/VideoProcessing/VideoProcessingSoftLink.h 2018-01-26 22:37:24 UTC (rev 227698)
+++ tags/Safari-605.1.25.1/Source/ThirdParty/libwebrtc/Source/webrtc/sdk/objc/Framework/Classes/VideoProcessing/VideoProcessingSoftLink.h 2018-01-26 23:44:09 UTC (rev 227699)
@@ -30,12 +30,8 @@
#include <AvailabilityMacros.h>
#include <TargetConditionals.h>
-#if (defined(TARGET_OS_IPHONE) && TARGET_OS_IPHONE) || (defined(TARGET_IPHONE_SIMULATOR) && TARGET_IPHONE_SIMULATOR)
-// FIXME: Activate VCP for iOS/iOS simulator
+// FIXME: Activate VCP for iOS/iOS simulator/MacOS
#define ENABLE_VCP_ENCODER 0
-#elif (defined(TARGET_OS_MAC) && TARGET_OS_MAC)
-#define ENABLE_VCP_ENCODER (__MAC_OS_X_VERSION_MAX_ALLOWED >= 101304)
-#endif
#if ENABLE_VCP_ENCODER
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
