| Index: media/base/mac/videotoolbox_glue.mm
|
| diff --git a/media/base/mac/videotoolbox_glue.mm b/media/base/mac/videotoolbox_glue.mm
|
| index 234f0ee184dd609ab81bed3a8bc66997c1c0ee8e..010767c8ee140cb923bbdb00d26d5a9b99e091a1 100644
|
| --- a/media/base/mac/videotoolbox_glue.mm
|
| +++ b/media/base/mac/videotoolbox_glue.mm
|
| @@ -53,7 +53,6 @@
|
| CFStringRef* kVTCompressionPropertyKey_AllowFrameReordering;
|
| CFStringRef* kVTCompressionPropertyKey_AverageBitRate;
|
| CFStringRef* kVTCompressionPropertyKey_ColorPrimaries;
|
| - CFStringRef* kVTCompressionPropertyKey_DataRateLimits;
|
| CFStringRef* kVTCompressionPropertyKey_ExpectedFrameRate;
|
| CFStringRef* kVTCompressionPropertyKey_MaxFrameDelayCount;
|
| CFStringRef* kVTCompressionPropertyKey_MaxKeyFrameInterval;
|
| @@ -69,8 +68,6 @@
|
| CFStringRef* kVTProfileLevel_H264_High_AutoLevel;
|
| CFStringRef*
|
| kVTVideoEncoderSpecification_EnableHardwareAcceleratedVideoEncoder;
|
| - CFStringRef*
|
| - kVTVideoEncoderSpecification_RequireHardwareAcceleratedVideoEncoder;
|
| };
|
|
|
| // Lazy-instance responsible for loading VideoToolbox.
|
| @@ -101,7 +98,6 @@
|
| LOAD_SYMBOL(kVTCompressionPropertyKey_AllowFrameReordering)
|
| LOAD_SYMBOL(kVTCompressionPropertyKey_AverageBitRate)
|
| LOAD_SYMBOL(kVTCompressionPropertyKey_ColorPrimaries)
|
| - LOAD_SYMBOL(kVTCompressionPropertyKey_DataRateLimits)
|
| LOAD_SYMBOL(kVTCompressionPropertyKey_ExpectedFrameRate)
|
| LOAD_SYMBOL(kVTCompressionPropertyKey_MaxFrameDelayCount)
|
| LOAD_SYMBOL(kVTCompressionPropertyKey_MaxKeyFrameInterval)
|
| @@ -117,8 +113,6 @@
|
| LOAD_SYMBOL(kVTProfileLevel_H264_High_AutoLevel)
|
| LOAD_SYMBOL(
|
| kVTVideoEncoderSpecification_EnableHardwareAcceleratedVideoEncoder)
|
| - LOAD_SYMBOL(
|
| - kVTVideoEncoderSpecification_RequireHardwareAcceleratedVideoEncoder)
|
|
|
| #undef LOAD_SYMBOL
|
|
|
| @@ -222,7 +216,6 @@
|
| KEY_ACCESSOR(kVTCompressionPropertyKey_AllowFrameReordering)
|
| KEY_ACCESSOR(kVTCompressionPropertyKey_AverageBitRate)
|
| KEY_ACCESSOR(kVTCompressionPropertyKey_ColorPrimaries)
|
| -KEY_ACCESSOR(kVTCompressionPropertyKey_DataRateLimits)
|
| KEY_ACCESSOR(kVTCompressionPropertyKey_ExpectedFrameRate)
|
| KEY_ACCESSOR(kVTCompressionPropertyKey_MaxFrameDelayCount)
|
| KEY_ACCESSOR(kVTCompressionPropertyKey_MaxKeyFrameInterval)
|
| @@ -237,7 +230,5 @@
|
| KEY_ACCESSOR(kVTProfileLevel_H264_Extended_AutoLevel)
|
| KEY_ACCESSOR(kVTProfileLevel_H264_High_AutoLevel)
|
| KEY_ACCESSOR(kVTVideoEncoderSpecification_EnableHardwareAcceleratedVideoEncoder)
|
| -KEY_ACCESSOR(
|
| - kVTVideoEncoderSpecification_RequireHardwareAcceleratedVideoEncoder)
|
|
|
| #undef KEY_ACCESSOR
|
|
|