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

Unified Diff: content/renderer/media/gpu/rtc_video_encoder_factory.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
Index: content/renderer/media/gpu/rtc_video_encoder_factory.cc
diff --git a/content/renderer/media/gpu/rtc_video_encoder_factory.cc b/content/renderer/media/gpu/rtc_video_encoder_factory.cc
index 6734d4527d488669a32fe10141ba9fc79c300eb0..f27cc610d3f530bce278bb4be53923d11b2508d8 100644
--- a/content/renderer/media/gpu/rtc_video_encoder_factory.cc
+++ b/content/renderer/media/gpu/rtc_video_encoder_factory.cc
@@ -39,10 +39,10 @@ void VEAToWebRTCCodecs(
// kEnableWebRtcHWH264Encoding flag is only enabled for extensions, and
// can be used without SW fallback.
bool webrtc_h264_sw_enabled = false;
-#if BUILDFLAG(RTC_USE_H264)
+#if BUILDFLAG(RTC_USE_H264) && !defined(MEDIA_DISABLE_FFMPEG)
webrtc_h264_sw_enabled =
base::FeatureList::IsEnabled(kWebRtcH264WithOpenH264FFmpeg);
-#endif // BUILDFLAG(RTC_USE_H264)
+#endif // BUILDFLAG(RTC_USE_H264) && !defined(MEDIA_DISABLE_FFMPEG)
if (cmd_line->HasSwitch(switches::kEnableWebRtcHWH264Encoding) ||
webrtc_h264_sw_enabled) {
codecs->push_back(cricket::WebRtcVideoEncoderFactory::VideoCodec(

Powered by Google App Engine
This is Rietveld 408576698