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

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

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: rtc_initialize_ffmpeg 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
« no previous file with comments | « webrtc/modules/video_coding/BUILD.gn ('k') | webrtc/modules/video_coding/codecs/h264/h264_decoder_impl.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webrtc/modules/video_coding/codecs/h264/h264.gypi
diff --git a/webrtc/modules/video_coding/codecs/h264/h264.gypi b/webrtc/modules/video_coding/codecs/h264/h264.gypi
index 0e80561bdfddd54ea6165908d7e7816917935a35..e82b0fd4cd39129a98709e1e139f8a6969124e2e 100644
--- a/webrtc/modules/video_coding/codecs/h264/h264.gypi
+++ b/webrtc/modules/video_coding/codecs/h264/h264.gypi
@@ -27,6 +27,13 @@
'defines': [
'WEBRTC_THIRD_PARTY_H264',
],
+ 'conditions': [
+ ['rtc_initialize_ffmpeg==1', {
+ 'defines': [
+ 'WEBRTC_INITIALIZE_FFMPEG',
+ ],
+ }],
+ ],
'dependencies': [
'<(DEPTH)/third_party/ffmpeg/ffmpeg.gyp:ffmpeg',
'<(DEPTH)/third_party/openh264/openh264.gyp:openh264_encoder',
« no previous file with comments | « webrtc/modules/video_coding/BUILD.gn ('k') | webrtc/modules/video_coding/codecs/h264/h264_decoder_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698