Skip to content

Commit b41e114

Browse files
committed
Merge branch 'development'
2 parents caafee5 + 59e7144 commit b41e114

File tree

1 file changed

+8
-3
lines changed

1 file changed

+8
-3
lines changed

Sources/OpenTimelineIO-AVFoundation/OpenTimelineIO-Extensions/ExternalReference.swift

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,14 @@ extension ExternalReference
2323

2424
if targetURL.hasPrefix("file://")
2525
{
26+
if let fileURL = URL(string: targetURL),
27+
let asset = self.testForAsset(url:fileURL, baseURL: baseURL)
28+
{
29+
return asset
30+
}
31+
2632
let fileURL = URL(fileURLWithPath:targetURL.replacingOccurrences(of:"file://", with: "./"))
27-
if
28-
let asset = self.testForAsset(url:fileURL, baseURL:baseURL)
33+
if let asset = self.testForAsset(url:fileURL, baseURL:baseURL)
2934
{
3035
return asset
3136
}
@@ -45,7 +50,7 @@ extension ExternalReference
4550

4651
fileprivate func testForAsset(url:URL, baseURL:URL?) -> AVURLAsset?
4752
{
48-
return self.testForAsset(path: url.standardizedFileURL.absoluteURL.path(), baseURL: baseURL)
53+
return self.testForAsset(path: url.standardizedFileURL.absoluteURL.path(percentEncoded: false), baseURL: baseURL)
4954
}
5055

5156
fileprivate func testForAsset(path:String, baseURL:URL?) -> AVURLAsset?

0 commit comments

Comments
 (0)