Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(296)

Unified Diff: chrome/browser/about_flags.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:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | chrome/utility/media_galleries/media_metadata_parser.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/about_flags.cc
diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
index 49896d40f278ead9ef1e961d5ea702160a0d3d91..852f39565d523576ff8bf9459f14b45cb04e3552 100644
--- a/chrome/browser/about_flags.cc
+++ b/chrome/browser/about_flags.cc
@@ -1929,12 +1929,14 @@ const FeatureEntry kFeatureEntries[] = {
IDS_FLAGS_ENABLE_NTP_PHYSICAL_WEB_PAGE_SUGGESTIONS_DESCRIPTION, kOsAndroid,
FEATURE_VALUE_TYPE(ntp_snippets::kPhysicalWebPageSuggestionsFeature)},
#endif // defined(OS_ANDROID)
-#if defined(ENABLE_WEBRTC) && BUILDFLAG(RTC_USE_H264)
+#if defined(ENABLE_WEBRTC) && BUILDFLAG(RTC_USE_H264) && \
+ !defined(MEDIA_DISABLE_FFMPEG)
{"enable-webrtc-h264-with-openh264-ffmpeg",
IDS_FLAGS_WEBRTC_H264_WITH_OPENH264_FFMPEG_NAME,
IDS_FLAGS_WEBRTC_H264_WITH_OPENH264_FFMPEG_DESCRIPTION, kOsDesktop,
FEATURE_VALUE_TYPE(content::kWebRtcH264WithOpenH264FFmpeg)},
-#endif // defined(ENABLE_WEBRTC) && BUILDFLAG(RTC_USE_H264)
+#endif // defined(ENABLE_WEBRTC) && BUILDFLAG(RTC_USE_H264) &&
+ // !defined(MEDIA_DISABLE_FFMPEG)
#if defined(OS_ANDROID)
{"ime-thread", IDS_FLAGS_IME_THREAD_NAME, IDS_FLAGS_IME_THREAD_DESCRIPTION,
kOsAndroid, FEATURE_VALUE_TYPE(features::kImeThread)},
« no previous file with comments | « no previous file | chrome/utility/media_galleries/media_metadata_parser.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698