diff options
| author | Joel Fischer <joeljfischer@gmail.com> | 2017-08-01 15:30:04 -0400 |
|---|---|---|
| committer | Joel Fischer <joeljfischer@gmail.com> | 2017-08-01 15:30:04 -0400 |
| commit | 17c0e6af14b49b35012f222fb3b0910a98ad45d3 (patch) | |
| tree | 0ea4680063ce1e79cd58672d85432b92c0bfab91 /SmartDeviceLink/SDLVideoEncoder.m | |
| parent | e6c4c0519ba95004b129f0a1a8ea0d546a68b37e (diff) | |
| parent | 7b7aa3da1b60acd79f5f7a98eab5e1d62ae866a9 (diff) | |
| download | sdl_ios-17c0e6af14b49b35012f222fb3b0910a98ad45d3.tar.gz | |
Merge branch 'release/5.0.0' into feature/streaming_media_manager
# Conflicts:
# SmartDeviceLink-iOS.podspec
# SmartDeviceLink-iOS.xcodeproj/project.pbxproj
# SmartDeviceLink/SDLStreamingMediaManager.m
Diffstat (limited to 'SmartDeviceLink/SDLVideoEncoder.m')
| -rw-r--r-- | SmartDeviceLink/SDLVideoEncoder.m | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/SmartDeviceLink/SDLVideoEncoder.m b/SmartDeviceLink/SDLVideoEncoder.m index 0f6a6d57c..159444cab 100644 --- a/SmartDeviceLink/SDLVideoEncoder.m +++ b/SmartDeviceLink/SDLVideoEncoder.m @@ -152,7 +152,7 @@ static NSDictionary<NSString *, id>* _defaultVideoEncoderSettings; void sdl_videoEncoderOutputCallback(void * CM_NULLABLE outputCallbackRefCon, void * CM_NULLABLE sourceFrameRefCon, OSStatus status, VTEncodeInfoFlags infoFlags, CM_NULLABLE CMSampleBufferRef sampleBuffer) { // If there was an error in the encoding, drop the frame if (status != noErr) { - SDLLogW(@"Error encoding video frame: %d", status); + SDLLogW(@"Error encoding video frame: %d", (int)status); return; } |