From 001d3ea624975ec15d7b89fc94a8201a6795f204 Mon Sep 17 00:00:00 2001 From: Eric Jensen Date: Wed, 8 Jun 2016 12:37:32 -0700 Subject: [PATCH 1/2] Use a strong reference to the current asset in order to prevent setting a placeholder image if the asset is set to nil while the placeholder image is generating --- AsyncDisplayKit/ASVideoNode.mm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/AsyncDisplayKit/ASVideoNode.mm b/AsyncDisplayKit/ASVideoNode.mm index 89cb9fa5bb..6240ec55f6 100644 --- a/AsyncDisplayKit/ASVideoNode.mm +++ b/AsyncDisplayKit/ASVideoNode.mm @@ -224,7 +224,7 @@ static NSString * const kStatus = @"status"; - (void)generatePlaceholderImage { ASVideoNode * __weak weakSelf = self; - AVAsset * __weak asset = self.asset; + AVAsset *asset = self.asset; [self imageAtTime:kCMTimeZero completionHandler:^(UIImage *image) { ASPerformBlockOnMainThread(^{ From 5cc25686ff08d00868cddef447a001ae2147bec0 Mon Sep 17 00:00:00 2001 From: Eric Jensen Date: Wed, 8 Jun 2016 12:37:46 -0700 Subject: [PATCH 2/2] Correct documentation comment --- AsyncDisplayKit/ASVideoNode.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/AsyncDisplayKit/ASVideoNode.h b/AsyncDisplayKit/ASVideoNode.h index 98c7754d01..d061accb58 100644 --- a/AsyncDisplayKit/ASVideoNode.h +++ b/AsyncDisplayKit/ASVideoNode.h @@ -55,7 +55,7 @@ NS_ASSUME_NONNULL_BEGIN @property (nonatomic, assign, readwrite) BOOL shouldAggressivelyRecoverFromStall; @property (nonatomic, assign, readonly) ASVideoNodePlayerState playerState; -//! Defaults to 100 +//! Defaults to 1000 @property (nonatomic, assign) int32_t periodicTimeObserverTimescale; //! Defaults to AVLayerVideoGravityResizeAspect