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

Unified Diff: webrtc/build/webrtc.gni

Issue 1639273002: H264: Thread-safe InitializeFFmpeg. Flag to control if InitializeFFmpeg should be called. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Created 4 years, 11 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/build/webrtc.gni
diff --git a/webrtc/build/webrtc.gni b/webrtc/build/webrtc.gni
index f784ab1830f64625f0dc75a967cc54804b810d5e..8b4b4938c512f9f369762174597fd91f2cea1f8e 100644
--- a/webrtc/build/webrtc.gni
+++ b/webrtc/build/webrtc.gni
@@ -96,9 +96,16 @@ declare_args() {
# support, |ffmpeg_branding| has to separately be set to a value that
# includes H.264, for example "Chrome". If FFmpeg is built without H.264,
# compilation succeeds but |H264DecoderImpl| fails to initialize.
+ # See also: |rtc_skip_ffmpeg_init|.
# CHECK THE OPENH264, FFMPEG AND H.264 LICENSES/PATENTS BEFORE BUILDING.
# http://www.openh264.org, https://www.ffmpeg.org/
rtc_use_h264 = false
+
+ # FFmpeg must be initialized for |H264DecoderImpl| to work. This can be done
+ # by WebRTC during |H264DecoderImpl::InitDecode| or externally. FFmpeg must
+ # only be initialized once. Projects that initialize FFmpeg externally, such
+ # as Chromium, must set this flag so that WebRTC does not also initialize.
+ rtc_skip_ffmpeg_init = build_with_chromium
}
# A second declare_args block, so that declarations within it can

Powered by Google App Engine
This is Rietveld 408576698