Title: [161763] trunk/Source/WebCore
- Revision
- 161763
- Author
- [email protected]
- Date
- 2014-01-11 08:29:06 -0800 (Sat, 11 Jan 2014)
Log Message
Fix build of SourceBufferPrivateAVFObjC.mm on iOS.
* platform/graphics/avfoundation/objc/SourceBufferPrivateAVFObjC.mm:
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (161762 => 161763)
--- trunk/Source/WebCore/ChangeLog 2014-01-11 16:29:04 UTC (rev 161762)
+++ trunk/Source/WebCore/ChangeLog 2014-01-11 16:29:06 UTC (rev 161763)
@@ -1,5 +1,11 @@
2014-01-11 Simon Fraser <[email protected]>
+ Fix build of SourceBufferPrivateAVFObjC.mm on iOS.
+
+ * platform/graphics/avfoundation/objc/SourceBufferPrivateAVFObjC.mm:
+
+2014-01-11 Simon Fraser <[email protected]>
+
Fix use of nonexistent kCGColorSpaceSRGB on iOS.
* platform/graphics/cg/GraphicsContextCG.cpp:
Modified: trunk/Source/WebCore/platform/graphics/avfoundation/objc/SourceBufferPrivateAVFObjC.mm (161762 => 161763)
--- trunk/Source/WebCore/platform/graphics/avfoundation/objc/SourceBufferPrivateAVFObjC.mm 2014-01-11 16:29:04 UTC (rev 161762)
+++ trunk/Source/WebCore/platform/graphics/avfoundation/objc/SourceBufferPrivateAVFObjC.mm 2014-01-11 16:29:06 UTC (rev 161763)
@@ -42,8 +42,7 @@
#import "AudioTrackPrivateMediaSourceAVFObjC.h"
#import "VideoTrackPrivateMediaSourceAVFObjC.h"
#import "InbandTextTrackPrivateAVFObjC.h"
-#import <AVFoundation/AVAssetTrack.h>
-#import <AVFoundation/AVSampleBufferDisplayLayer.h>
+#import <AVFoundation/AVFoundation.h>
#import <objc/runtime.h>
#import <wtf/text/AtomicString.h>
#import <wtf/text/CString.h>
@@ -119,7 +118,7 @@
#pragma mark -
#pragma mark AVSampleBufferAudioRenderer
-#if __MAC_OS_X_VERSION_MIN_REQUIRED <= 1090
+#if PLATFORM(IOS) || __MAC_OS_X_VERSION_MIN_REQUIRED <= 1090
@interface AVSampleBufferAudioRenderer : NSObject
- (NSInteger)status;
- (NSError*)error;
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
