webrtc/modules/video_coding/codecs/h264/h264.cc - Issue 2018273002: Updated #if in IsH264CodecSupported to match H264[En/De]coder::Create.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: webrtc/modules/video_coding/codecs/h264/h264.cc

Issue 2018273002: Updated #if in IsH264CodecSupported to match H264[En/De]coder::Create. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master

Patch Set: Created 4 years, 7 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

Index: webrtc/modules/video_coding/codecs/h264/h264.cc

diff --git a/webrtc/modules/video_coding/codecs/h264/h264.cc b/webrtc/modules/video_coding/codecs/h264/h264.cc

index 9fdc4d4623c232b859e8de1f214ced85c5894803..1c0fc705ae4d55b05dd61bf3e195032af86771c6 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;

}

« no previous file with comments | « no previous file | no next file » | no next file with comments »