Add 'is_chrome_branded' guard to the default of 'rtc_use_h264'

This doesn't change behavior at the moment because Chromium's 'proprietary_codecs' is already conditional on 'is_chrome_branded' but this guards WebRTC's default from upstream changes like https://chromium-review.googlesource.com/c/chromium/src/+/835010/6/build/config/features.gni [email protected] Bug: webrtc:8675 Change-Id: Ic2ae311b5fc70a4d1ac1aefe4cc27574e4fcee40 Reviewed-on: https://webrtc-review.googlesource.com/36321 Commit-Queue: Oleh Prypin <[email protected]> Reviewed-by: Oleh Prypin <[email protected]> Reviewed-by: Henrik Boström <[email protected]> Cr-Commit-Position: refs/heads/master@{#21452}
czs100 · Dec 27, 2017 · d3070f4 · d3070f4
1 parent 97cb448
commit d3070f4
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/webrtc.gni b/webrtc.gni
@@ -149,7 +149,8 @@ declare_args() {
   # also: |rtc_initialize_ffmpeg|.
   # CHECK THE OPENH264, FFMPEG AND H.264 LICENSES/PATENTS BEFORE BUILDING.
   # http://www.openh264.org, https://www.ffmpeg.org/
-  rtc_use_h264 = proprietary_codecs && !is_android && !is_ios
+  rtc_use_h264 =
+      is_chrome_branded && proprietary_codecs && !is_android && !is_ios
 
   # By default, use normal platform audio support or dummy audio, but don't
   # use file-based audio playout and record.