From 073eb7ed1e398bedb8aeef1ce1bfd99f6cd0131c Mon Sep 17 00:00:00 2001 From: hbos Date: Mon, 30 May 2016 05:15:25 -0700 Subject: [PATCH] Updated #if in IsH264CodecSupported to match H264[En/De]coder::Create. This will hopefully resolve a crash that might occur if it thinks H264 is supported when in fact it isn't. BUG=chromium:615513 Review-Url: https://codereview.webrtc.org/2018273002 Cr-Commit-Position: refs/heads/master@{#12958} --- webrtc/modules/video_coding/codecs/h264/h264.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/webrtc/modules/video_coding/codecs/h264/h264.cc b/webrtc/modules/video_coding/codecs/h264/h264.cc index 9fdc4d4623..1c0fc705ae 100644 --- a/webrtc/modules/video_coding/codecs/h264/h264.cc +++ b/webrtc/modules/video_coding/codecs/h264/h264.cc @@ -48,7 +48,7 @@ extern bool IsH264CodecSupportedObjC(); // If any H.264 codec is supported (iOS HW or OpenH264/FFmpeg). bool IsH264CodecSupported() { -#if defined(WEBRTC_IOS) +#if defined(WEBRTC_IOS) && defined(WEBRTC_VIDEO_TOOLBOX_SUPPORTED) if (IsH264CodecSupportedObjC()) { return true; }