← Back to branch summary

~chromium-team/chromium-browser/artful-beta

« back to all changes in this revision

Viewing changes to debian/patches/fix-ffmpeg-ia32-build.patch

  • Committer: Olivier Tilloy
  • Date: 2018-07-13 17:38:25 UTC
  • Revision ID: olivier.tilloy@canonical.com-20180713173825-7zy5ygmwijv2wkmz
* Upstream beta channel update: 68.0.3440.59

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/fix-ffmpeg-ia32-build.patch
 
1
Description: fix ffmpeg builds on x86, where there aren't enough registers
 
2
Origin: https://chromium.googlesource.com/chromium/third_party/ffmpeg.git/+/5dccf033d1d44afeb2901fb6239268eba9ce39de
 
3
 
 
4
--- a/third_party/ffmpeg/BUILD.gn
 
5
+++ b/third_party/ffmpeg/BUILD.gn
 
6
@@ -239,11 +239,9 @@ target(link_target_type, "ffmpeg_interna
 
7
   # Windows builds can't compile without EBP because we can't omit frame
 
8
   # pointers like we do on posix.
 
9
   if (target_cpu == "x86") {
 
10
-    if (using_sanitizer || is_win) {
 
11
       defines += [ "HAVE_EBP_AVAILABLE=0" ]
 
12
     } else {
 
13
       defines += [ "HAVE_EBP_AVAILABLE=1" ]
 
14
-    }
 
15
   }
 
16
 
 
17
   if (is_posix || is_fuchsia) {