aboutsummaryrefslogtreecommitdiffhomepage
path: root/DEPS
diff options
context:
space:
mode:
authorGravatar msarett <msarett@google.com>2015-11-24 07:14:34 -0800
committerGravatar Commit bot <commit-bot@chromium.org>2015-11-24 07:14:35 -0800
commit5c2cbf23bbe255a8d560cd41ecacc916a6b494b3 (patch)
tree372dc7b7a7b2e11f627bde9f476f48afb9990ae8 /DEPS
parent3d2e65439ef98c4b8055e47b04e00d0c8926bf0a (diff)
Cherry pick one more commit into libjpeg-turbo
I forgot to add the last fix for the skip scanlines patch. BUG=skia: Review URL: https://codereview.chromium.org/1476483002
Diffstat (limited to 'DEPS')
-rw-r--r--DEPS2
1 files changed, 1 insertions, 1 deletions
diff --git a/DEPS b/DEPS
index 635f466f26..a76953d31d 100644
--- a/DEPS
+++ b/DEPS
@@ -22,7 +22,7 @@ deps = {
"third_party/externals/libpng" : "https://skia.googlesource.com/third_party/libpng.git@070a616b8275277e18ef8ee91e2ca23f7bdc67d5",
"third_party/externals/giflib" : "https://android.googlesource.com/platform/external/giflib.git@ab10e256df4f684260ca239905b1cec727181f6c",
- "third_party/externals/libjpeg-turbo" : "https://skia.googlesource.com/third_party/libjpeg-turbo.git@363c754f56f13d045df270f269453f2fc1753d76",
+ "third_party/externals/libjpeg-turbo" : "https://skia.googlesource.com/third_party/libjpeg-turbo.git@36422d9e165a33914436068536772cc6ed1e7886",
# libjpeg-turbo depends on yasm to compile .asm files
"third_party/externals/yasm/source/patched-yasm/" : "https://chromium.googlesource.com/chromium/deps/yasm/patched-yasm.git@4671120cd8558ce62ee8672ebf3eb6f5216f909b",
"third_party/externals/yasm/binaries" : "https://chromium.googlesource.com/chromium/deps/yasm/binaries.git@52f9b3f4b0aa06da24ef8b123058bb61ee468881",