content/public/common/feature_h264_with_openh264_ffmpeg.cc - Issue 2346283002: Fix build with media_use_ffmpeg=false

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: content/public/common/feature_h264_with_openh264_ffmpeg.cc

Issue 2346283002: Fix build with media_use_ffmpeg=false (Closed)

Patch Set: Created 4 years, 3 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:

Index: content/public/common/feature_h264_with_openh264_ffmpeg.cc

diff --git a/content/public/common/feature_h264_with_openh264_ffmpeg.cc b/content/public/common/feature_h264_with_openh264_ffmpeg.cc

index 7b102a4760282e1300d4cb55d3b6965c7820e8a3..cf93fd0bed568bd4bdf3bd2009203c5d87b34dd6 100644

--- a/content/public/common/feature_h264_with_openh264_ffmpeg.cc

+++ b/content/public/common/feature_h264_with_openh264_ffmpeg.cc

@@ -6,12 +6,12 @@

namespace content {

-#if BUILDFLAG(RTC_USE_H264)

+#if BUILDFLAG(RTC_USE_H264) && !defined(MEDIA_DISABLE_FFMPEG)

const base::Feature kWebRtcH264WithOpenH264FFmpeg {

"WebRTC-H264WithOpenH264FFmpeg", base::FEATURE_ENABLED_BY_DEFAULT

};

-#endif // BUILDFLAG(RTC_USE_H264)

+#endif // BUILDFLAG(RTC_USE_H264) && !defined(MEDIA_DISABLE_FFMPEG)

} // namespace content