Title: [202434] trunk/Source/WebCore
- Revision
- 202434
- Author
- [email protected]
- Date
- 2016-06-24 11:38:42 -0700 (Fri, 24 Jun 2016)
Log Message
Unreviewed build fix after r202429; AVStreamDataParser does not exist on iOS.
* platform/spi/mac/AVFoundationSPI.h:
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (202433 => 202434)
--- trunk/Source/WebCore/ChangeLog 2016-06-24 18:34:20 UTC (rev 202433)
+++ trunk/Source/WebCore/ChangeLog 2016-06-24 18:38:42 UTC (rev 202434)
@@ -1,5 +1,11 @@
2016-06-24 Jer Noble <[email protected]>
+ Unreviewed build fix after r202429; AVStreamDataParser does not exist on iOS.
+
+ * platform/spi/mac/AVFoundationSPI.h:
+
+2016-06-24 Jer Noble <[email protected]>
+
Unreviewed build fix after r202429; Fix the type of the delegate property on AVStreamDataParser.
* platform/graphics/avfoundation/objc/SourceBufferPrivateAVFObjC.mm:
Modified: trunk/Source/WebCore/platform/spi/mac/AVFoundationSPI.h (202433 => 202434)
--- trunk/Source/WebCore/platform/spi/mac/AVFoundationSPI.h 2016-06-24 18:34:20 UTC (rev 202433)
+++ trunk/Source/WebCore/platform/spi/mac/AVFoundationSPI.h 2016-06-24 18:38:42 UTC (rev 202434)
@@ -101,7 +101,7 @@
#pragma mark -
#pragma mark AVStreamDataParser
-
+#if !PLATFORM(IOS)
#if USE(APPLE_INTERNAL_SDK)
#import <AVFoundation/AVStreamDataParser.h>
#else
@@ -128,8 +128,16 @@
- (NSData *)streamingContentKeyRequestDataForApp:(NSData *)appIdentifier contentIdentifier:(NSData *)contentIdentifier trackID:(CMPersistentTrackID)trackID options:(NSDictionary *)options error:(NSError **)outError;
@end
NS_ASSUME_NONNULL_END
-#endif
+#endif // USE(APPLE_INTERNAL_SDK)
+NS_ASSUME_NONNULL_BEGIN
+@interface AVStreamDataParser (AVStreamDataParserPrivate)
++ (NSString *)outputMIMECodecParameterForInputMIMECodecParameter:(NSString *)inputMIMECodecParameter;
+@end
+NS_ASSUME_NONNULL_END
+
+#endif // !PLATFORM(IOS)
+
// FIXME: Wrap in a #if USE(APPLE_INTERNAL_SDK) once these SPI land
#import <AVFoundation/AVAssetResourceLoader.h>
@@ -141,8 +149,4 @@
@property (nonatomic, nullable, retain) NSURLSession *URLSession;
@end
-@interface AVStreamDataParser (AVStreamDataParserPrivate)
-+ (NSString *)outputMIMECodecParameterForInputMIMECodecParameter:(NSString *)inputMIMECodecParameter;
-@end
-
NS_ASSUME_NONNULL_END
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
