Title: [208245] branches/safari-602-branch/Source/WebCore
- Revision
- 208245
- Author
- matthew_han...@apple.com
- Date
- 2016-11-01 14:46:43 -0700 (Tue, 01 Nov 2016)
Log Message
Merge r208175. rdar://problem/29032335
Modified Paths
Diff
Modified: branches/safari-602-branch/Source/WebCore/ChangeLog (208244 => 208245)
--- branches/safari-602-branch/Source/WebCore/ChangeLog 2016-11-01 21:46:40 UTC (rev 208244)
+++ branches/safari-602-branch/Source/WebCore/ChangeLog 2016-11-01 21:46:43 UTC (rev 208245)
@@ -1,5 +1,15 @@
2016-11-01 Matthew Hanson <matthew_han...@apple.com>
+ Merge r208175. rdar://problem/29032335
+
+ 2016-10-31 Jer Noble <jer.no...@apple.com>
+
+ Unreviewed build fix for the build fix; AVStreamDataParser not defined on iOS.
+
+ * platform/spi/mac/AVFoundationSPI.h:
+
+2016-11-01 Matthew Hanson <matthew_han...@apple.com>
+
Merge r208171. rdar://problem/29032335
2016-10-31 Jer Noble <jer.no...@apple.com>
Modified: branches/safari-602-branch/Source/WebCore/platform/spi/mac/AVFoundationSPI.h (208244 => 208245)
--- branches/safari-602-branch/Source/WebCore/platform/spi/mac/AVFoundationSPI.h 2016-11-01 21:46:40 UTC (rev 208244)
+++ branches/safari-602-branch/Source/WebCore/platform/spi/mac/AVFoundationSPI.h 2016-11-01 21:46:43 UTC (rev 208245)
@@ -126,7 +126,7 @@
#endif // !PLATFORM(IOS)
#endif // USE(APPLE_INTERNAL_SDK)
-#if !USE(APPLE_INTERNAL_SDK) || (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED < 101200)
+#if PLATFORM(MAC) && (!USE(APPLE_INTERNAL_SDK) || __MAC_OS_X_VERSION_MIN_REQUIRED < 101200)
NS_ASSUME_NONNULL_BEGIN
@interface AVStreamDataParser (AVStreamDataParserPrivate)
+ (NSString *)outputMIMECodecParameterForInputMIMECodecParameter:(NSString *)inputMIMECodecParameter;
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
