From cc24128062d1f6b34052460bf4b3f7f854b263b4 Mon Sep 17 00:00:00 2001 From: jfroy Date: Tue, 3 Mar 2015 18:03:09 -0800 Subject: [PATCH] [cast] Stub out call to VideoEncoderImpl::IsSupported on iOS. CL 906403006 introduced a linking error by referencing a symbol that is not included in iOS builds of the cast sender library. This patch stubs out the relevant code. BUG=463713 Review URL: https://codereview.chromium.org/974133002 Cr-Commit-Position: refs/heads/master@{#318996} --- media/cast/sender/video_encoder.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/media/cast/sender/video_encoder.cc b/media/cast/sender/video_encoder.cc index d65bf3c8dc84..d23496b8fef9 100644 --- a/media/cast/sender/video_encoder.cc +++ b/media/cast/sender/video_encoder.cc @@ -34,8 +34,8 @@ scoped_ptr VideoEncoder::Create( } #endif // defined(OS_MACOSX) - // If the system provides a hardware-accelerated encoder, use it. #if !defined(OS_IOS) + // If the system provides a hardware-accelerated encoder, use it. if (ExternalVideoEncoder::IsSupported(video_config)) { return scoped_ptr(new SizeAdaptableExternalVideoEncoder( cast_environment, @@ -44,7 +44,6 @@ scoped_ptr VideoEncoder::Create( create_vea_cb, create_video_encode_memory_cb)); } -#endif // !defined(OS_IOS) // Attempt to use the software encoder implementation. if (VideoEncoderImpl::IsSupported(video_config)) { @@ -53,6 +52,7 @@ scoped_ptr VideoEncoder::Create( video_config, status_change_cb)); } +#endif // !defined(OS_IOS) // No encoder implementation will suffice. return nullptr; -- 2.11.4.GIT