Title: [208244] branches/safari-602-branch/Source/WebCore
- Revision
- 208244
- Author
- matthew_han...@apple.com
- Date
- 2016-11-01 14:46:40 -0700 (Tue, 01 Nov 2016)
Log Message
Merge r208171. rdar://problem/29032335
Modified Paths
Diff
Modified: branches/safari-602-branch/Source/WebCore/ChangeLog (208243 => 208244)
--- branches/safari-602-branch/Source/WebCore/ChangeLog 2016-11-01 21:46:37 UTC (rev 208243)
+++ branches/safari-602-branch/Source/WebCore/ChangeLog 2016-11-01 21:46:40 UTC (rev 208244)
@@ -1,5 +1,16 @@
2016-11-01 Matthew Hanson <matthew_han...@apple.com>
+ Merge r208171. rdar://problem/29032335
+
+ 2016-10-31 Jer Noble <jer.no...@apple.com>
+
+ Unreviewed build fix after r208151; outputMIMECodecParameterForInputMIMECodecParameter not
+ defined pre-Sierra.
+
+ * platform/spi/mac/AVFoundationSPI.h:
+
+2016-11-01 Matthew Hanson <matthew_han...@apple.com>
+
Merge r208161. rdar://problem/29032335
2016-10-31 Jer Noble <jer.no...@apple.com>
Modified: branches/safari-602-branch/Source/WebCore/platform/spi/mac/AVFoundationSPI.h (208243 => 208244)
--- branches/safari-602-branch/Source/WebCore/platform/spi/mac/AVFoundationSPI.h 2016-11-01 21:46:37 UTC (rev 208243)
+++ branches/safari-602-branch/Source/WebCore/platform/spi/mac/AVFoundationSPI.h 2016-11-01 21:46:40 UTC (rev 208244)
@@ -121,14 +121,19 @@
- (NSData *)streamingContentKeyRequestDataForApp:(NSData *)appIdentifier contentIdentifier:(NSData *)contentIdentifier trackID:(CMPersistentTrackID)trackID options:(NSDictionary *)options error:(NSError **)outError;
@end
+NS_ASSUME_NONNULL_END
+
+#endif // !PLATFORM(IOS)
+#endif // USE(APPLE_INTERNAL_SDK)
+
+#if !USE(APPLE_INTERNAL_SDK) || (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED < 101200)
+NS_ASSUME_NONNULL_BEGIN
@interface AVStreamDataParser (AVStreamDataParserPrivate)
+ (NSString *)outputMIMECodecParameterForInputMIMECodecParameter:(NSString *)inputMIMECodecParameter;
@end
NS_ASSUME_NONNULL_END
+#endif
-#endif // !PLATFORM(IOS)
-#endif // USE(APPLE_INTERNAL_SDK)
-
#if PLATFORM(IOS) && (!HAVE(AVKIT) || !USE(APPLE_INTERNAL_SDK))
#import <AVFoundation/AVPlayerLayer.h>
@interface AVPlayerLayer (AVPlayerLayerPictureInPictureModeSupportPrivate)
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
