Skip to content

Commit d120638

Browse files
authored
Merge pull request #3932 from apple/swift-master-update-for-xcode-8-beta-4
Update master to build with Xcode 8 beta 4, OS X 10.12, iOS 10, tvOS …
2 parents 212ffad + d28ff85 commit d120638

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

54 files changed

+2266
-351
lines changed

apinotes/AVFoundation.apinotes

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,6 @@ Classes:
1414
- Selector: 'appendSampleBuffer:'
1515
SwiftName: append(_:)
1616
MethodKind: Instance
17-
- Selector: 'appendPixelBuffer:withPresentationTime:'
18-
SwiftName: append(_:withPresentationTime:)
19-
MethodKind: Instance
20-
- Selector: 'appendTimedMetadataGroup:'
21-
SwiftName: append(_:)
22-
MethodKind: Instance
2317
- Name: AVAssetWriterInputPixelBufferAdaptor
2418
Methods:
2519
- Selector: 'appendPixelBuffer:withPresentationTime:'
@@ -98,7 +92,7 @@ Classes:
9892
- Name: AVVideoComposition
9993
Methods:
10094
- Selector: 'videoCompositionWithPropertiesOfAsset:'
101-
SwiftName: init(withPropertiesOf:)
95+
SwiftName: init(propertiesOf:)
10296
MethodKind: Instance
10397
- Selector: 'videoCompositionWithAsset:applyingCIFiltersWithHandler:'
10498
SwiftName: init(asset:filterApplier:)
@@ -137,7 +131,6 @@ Classes:
137131
- Selector: 'initWithURL:fileType:error:'
138132
SwiftName: init(outputURL:fileType:)
139133
MethodKind: Instance
140-
Availability: nonswift
141134
- Selector: 'canApplyOutputSettings:forMediaType:'
142135
SwiftName: canApply(outputSettings:forMediaType:)
143136
MethodKind: Instance

0 commit comments

Comments
 (0)