Title: [216912] trunk/Source/WebCore
- Revision
- 216912
- Author
- pvol...@apple.com
- Date
- 2017-05-16 00:11:56 -0700 (Tue, 16 May 2017)
Log Message
Compile error, include file is not found.
https://bugs.webkit.org/show_bug.cgi?id=172105
Reviewed by Brent Fulgham.
Use __has_include to detect if include file exists.
* platform/mediastream/libwebrtc/H264VideoToolBoxEncoder.mm:
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (216911 => 216912)
--- trunk/Source/WebCore/ChangeLog 2017-05-16 07:09:56 UTC (rev 216911)
+++ trunk/Source/WebCore/ChangeLog 2017-05-16 07:11:56 UTC (rev 216912)
@@ -1,3 +1,14 @@
+2017-05-16 Per Arne Vollan <pvol...@apple.com>
+
+ Compile error, include file is not found.
+ https://bugs.webkit.org/show_bug.cgi?id=172105
+
+ Reviewed by Brent Fulgham.
+
+ Use __has_include to detect if include file exists.
+
+ * platform/mediastream/libwebrtc/H264VideoToolBoxEncoder.mm:
+
2017-05-15 Andy Estes <aes...@apple.com>
Make the application PID available to WebCore
Modified: trunk/Source/WebCore/platform/mediastream/libwebrtc/H264VideoToolBoxEncoder.mm (216911 => 216912)
--- trunk/Source/WebCore/platform/mediastream/libwebrtc/H264VideoToolBoxEncoder.mm 2017-05-16 07:09:56 UTC (rev 216911)
+++ trunk/Source/WebCore/platform/mediastream/libwebrtc/H264VideoToolBoxEncoder.mm 2017-05-16 07:11:56 UTC (rev 216912)
@@ -28,19 +28,18 @@
#if USE(LIBWEBRTC) && PLATFORM(COCOA)
-#if ENABLE(MAC_VIDEO_TOOLBOX)
+#if ENABLE(MAC_VIDEO_TOOLBOX) && USE(APPLE_INTERNAL_SDK) && __has_include(<WebKitAdditions/VideoToolBoxEncoderMac.mm>)
#import <WebKitAdditions/VideoToolBoxEncoderMac.mm>
-#endif
+#else
namespace WebCore {
-#if !ENABLE(MAC_VIDEO_TOOLBOX)
int H264VideoToolboxEncoder::CreateCompressionSession(VTCompressionSessionRef& compressionSession, VTCompressionOutputCallback outputCallback, int32_t width, int32_t height)
{
return webrtc::H264VideoToolboxEncoder::CreateCompressionSession(compressionSession, outputCallback, width, height);
}
+
+}
#endif
-}
-
#endif
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
