summaryrefslogtreecommitdiff
path: root/chromium/third_party/ffmpeg/ffmpeg_generated.gni
diff options
context:
space:
mode:
authorAllan Sandfeld Jensen <allan.jensen@qt.io>2017-01-04 14:17:57 +0100
committerAllan Sandfeld Jensen <allan.jensen@qt.io>2017-01-05 10:05:06 +0000
commit39d357e3248f80abea0159765ff39554affb40db (patch)
treeaba0e6bfb76de0244bba0f5fdbd64b830dd6e621 /chromium/third_party/ffmpeg/ffmpeg_generated.gni
parent87778abf5a1f89266f37d1321b92a21851d8244d (diff)
downloadqtwebengine-chromium-39d357e3248f80abea0159765ff39554affb40db.tar.gz
BASELINE: Update Chromium to 55.0.2883.105
And updates ninja to 1.7.2 Change-Id: I20d43c737f82764d857ada9a55586901b18b9243 Reviewed-by: Michael BrĂ¼ning <michael.bruning@qt.io>
Diffstat (limited to 'chromium/third_party/ffmpeg/ffmpeg_generated.gni')
-rw-r--r--chromium/third_party/ffmpeg/ffmpeg_generated.gni2
1 files changed, 1 insertions, 1 deletions
diff --git a/chromium/third_party/ffmpeg/ffmpeg_generated.gni b/chromium/third_party/ffmpeg/ffmpeg_generated.gni
index e952679c3e7..42c0bbf61f7 100644
--- a/chromium/third_party/ffmpeg/ffmpeg_generated.gni
+++ b/chromium/third_party/ffmpeg/ffmpeg_generated.gni
@@ -459,7 +459,7 @@ if ((is_linux && current_cpu == "arm64" && ffmpeg_branding == "Chrome") || (is_l
ffmpeg_gas_sources += [
"libavcodec/aarch64/autorename_libavcodec_aarch64_h264pred_neon.S",
"libavcodec/aarch64/autorename_libavcodec_aarch64_hpeldsp_neon.S",
- "libavcodec/aarch64/videodsp.S",
+ "libavcodec/aarch64/videodsp_aarch64.S",
]
}