Title: [170545] trunk/Source/WebCore
- Revision
- 170545
- Author
- [email protected]
- Date
- 2014-06-27 12:17:44 -0700 (Fri, 27 Jun 2014)
Log Message
[Mac] AVMetadataKeySpaceISOUserData not defined on 10.8
https://bugs.webkit.org/show_bug.cgi?id=134401
Reviewed by Jer Noble.
* platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm:
(WebCore::metadataType): Use SOFT_LINK_POINTER_OPTIONAL for AVMetadataKeySpaceISOUserData
so we don't have problems on OS versions where it isn't defined.
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (170544 => 170545)
--- trunk/Source/WebCore/ChangeLog 2014-06-27 18:55:46 UTC (rev 170544)
+++ trunk/Source/WebCore/ChangeLog 2014-06-27 19:17:44 UTC (rev 170545)
@@ -1,3 +1,14 @@
+2014-06-27 Eric Carlson <[email protected]>
+
+ [Mac] AVMetadataKeySpaceISOUserData not defined on 10.8
+ https://bugs.webkit.org/show_bug.cgi?id=134401
+
+ Reviewed by Jer Noble.
+
+ * platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm:
+ (WebCore::metadataType): Use SOFT_LINK_POINTER_OPTIONAL for AVMetadataKeySpaceISOUserData
+ so we don't have problems on OS versions where it isn't defined.
+
2014-06-27 Martin Hodovan <[email protected]>
REGRESSION (r168685): css calc() _expression_ fails
Modified: trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm (170544 => 170545)
--- trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm 2014-06-27 18:55:46 UTC (rev 170544)
+++ trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm 2014-06-27 19:17:44 UTC (rev 170545)
@@ -236,7 +236,7 @@
#if ENABLE(DATACUE_VALUE)
SOFT_LINK_POINTER(AVFoundation, AVMetadataKeySpaceQuickTimeUserData, NSString*)
-SOFT_LINK_POINTER(AVFoundation, AVMetadataKeySpaceISOUserData, NSString*)
+SOFT_LINK_POINTER_OPTIONAL(AVFoundation, AVMetadataKeySpaceISOUserData, NSString*)
SOFT_LINK_POINTER(AVFoundation, AVMetadataKeySpaceQuickTimeMetadata, NSString*)
SOFT_LINK_POINTER(AVFoundation, AVMetadataKeySpaceiTunes, NSString*)
SOFT_LINK_POINTER(AVFoundation, AVMetadataKeySpaceID3, NSString*)
@@ -2467,7 +2467,7 @@
if ([avMetadataKeySpace isEqualToString:AVMetadataKeySpaceQuickTimeUserData])
return quickTimeUserData;
- if ([avMetadataKeySpace isEqualToString:AVMetadataKeySpaceISOUserData])
+ if (AVMetadataKeySpaceISOUserData && [avMetadataKeySpace isEqualToString:AVMetadataKeySpaceISOUserData])
return isoUserData;
if ([avMetadataKeySpace isEqualToString:AVMetadataKeySpaceQuickTimeMetadata])
return quickTimeMetadata;
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
