Title: [210108] tags/Safari-604.1.1.1/Source/WebCore
- Revision
- 210108
- Author
- [email protected]
- Date
- 2016-12-22 12:45:09 -0800 (Thu, 22 Dec 2016)
Log Message
Merged r210099. rdar://problem/29782862
Modified Paths
Diff
Modified: tags/Safari-604.1.1.1/Source/WebCore/ChangeLog (210107 => 210108)
--- tags/Safari-604.1.1.1/Source/WebCore/ChangeLog 2016-12-22 20:44:27 UTC (rev 210107)
+++ tags/Safari-604.1.1.1/Source/WebCore/ChangeLog 2016-12-22 20:45:09 UTC (rev 210108)
@@ -1,3 +1,16 @@
+2016-12-22 Babak Shafiei <[email protected]>
+
+ Merge r210099.
+
+ 2016-12-22 Jer Noble <[email protected]>
+
+ Check for the existence of AVSampleBufferAudioRenderer.h before redeclaring AVSampleBufferAudioRenderer
+ https://bugs.webkit.org/show_bug.cgi?id=166421
+
+ Reviewed by Eric Carlson.
+
+ * platform/spi/mac/AVFoundationSPI.h:
+
2016-12-21 Babak Shafiei <[email protected]>
Roll out r209261.
Modified: tags/Safari-604.1.1.1/Source/WebCore/platform/spi/mac/AVFoundationSPI.h (210107 => 210108)
--- tags/Safari-604.1.1.1/Source/WebCore/platform/spi/mac/AVFoundationSPI.h 2016-12-22 20:44:27 UTC (rev 210107)
+++ tags/Safari-604.1.1.1/Source/WebCore/platform/spi/mac/AVFoundationSPI.h 2016-12-22 20:45:09 UTC (rev 210108)
@@ -180,6 +180,10 @@
NS_ASSUME_NONNULL_END
+#if __has_include("AVSampleBufferAudioRenderer.h")
+#import ("AVSampleBufferAudioRenderer")
+#else
+
NS_ASSUME_NONNULL_BEGIN
@interface AVSampleBufferAudioRenderer : NSObject
@@ -195,4 +199,6 @@
@property (nonatomic, copy) NSString *audioTimePitchAlgorithm;
@end
+#endif // __has_include("AVSampleBufferAudioRenderer.h")
+
NS_ASSUME_NONNULL_END
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
