diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2018-08-24 12:15:48 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2018-08-28 13:30:04 +0000 |
| commit | b014812705fc80bff0a5c120dfcef88f349816dc (patch) | |
| tree | 25a2e2d9fa285f1add86aa333389a839f81a39ae /chromium/third_party/ffmpeg/ffmpeg_generated.gni | |
| parent | 9f4560b1027ae06fdb497023cdcaf91b8511fa74 (diff) | |
| download | qtwebengine-chromium-b014812705fc80bff0a5c120dfcef88f349816dc.tar.gz | |
BASELINE: Update Chromium to 68.0.3440.125
Change-Id: I23f19369e01f688e496f5bf179abb521ad73874f
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Diffstat (limited to 'chromium/third_party/ffmpeg/ffmpeg_generated.gni')
| -rw-r--r-- | chromium/third_party/ffmpeg/ffmpeg_generated.gni | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/chromium/third_party/ffmpeg/ffmpeg_generated.gni b/chromium/third_party/ffmpeg/ffmpeg_generated.gni index a856c31ce6f..3e6e8ee2c02 100644 --- a/chromium/third_party/ffmpeg/ffmpeg_generated.gni +++ b/chromium/third_party/ffmpeg/ffmpeg_generated.gni @@ -148,6 +148,7 @@ if ((is_android && current_cpu == "arm" && arm_use_neon) || (is_android && curre "libavutil/dict.c", "libavutil/display.c", "libavutil/downmix_info.c", + "libavutil/encryption_info.c", "libavutil/error.c", "libavutil/eval.c", "libavutil/fifo.c", @@ -622,12 +623,6 @@ if ((use_linux_config && current_cpu == "arm" && arm_use_neon && ffmpeg_branding ] } -if (is_win && current_cpu == "x64") { - ffmpeg_yasm_sources += [ - "libavutil/x86/emms.asm", - ] -} - if ((use_linux_config && current_cpu == "mips64el" && ffmpeg_branding == "ChromeOS") || (use_linux_config && current_cpu == "mipsel" && ffmpeg_branding == "ChromeOS")) { ffmpeg_c_sources += [ "libavcodec/mips/blockdsp_init_mips.c", |