summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormarpan <marpan@chromium.org>2015-11-07 08:16:22 -0800
committerCommit bot <commit-bot@chromium.org>2015-11-07 16:17:14 +0000
commitcfe4464f9074cc22a783ecd1d4e58b3a18abc41c (patch)
tree80e7bc0546db911c7772441cd145b9ebe5e1f6f1
parent3aa02fe74186a07f11dae868b659db0ecf0d4013 (diff)
downloadchromium_src-cfe4464f9074cc22a783ecd1d4e58b3a18abc41c.zip
chromium_src-cfe4464f9074cc22a783ecd1d4e58b3a18abc41c.tar.gz
chromium_src-cfe4464f9074cc22a783ecd1d4e58b3a18abc41c.tar.bz2
Roll src/third_party/libvpx_new/source/libvpx/ c6641709a..eba14ddbe (5 commits).
https://chromium.googlesource.com/webm/libvpx.git/+log/c6641709a707..eba14ddbe7e7 $ git log c6641709a..eba14ddbe --date=short --no-merges --format='%ad %ae %s' 2015-11-06 jzern Revert "Add AVX vectorized vp9_diamond_search_sad" 2015-11-06 marpan vp9: Disable noise estimate on resize trigger frame. 2015-11-05 marpan vp9: Updates to noise estimation. 2015-11-05 jzern vp9_spatial_svc_encoder.sh: fix command line param 2015-10-28 gezalore Add AVX vectorized vp9_diamond_search_sad R=johannkoenig@google.com Review URL: https://codereview.chromium.org/1424273003 Cr-Commit-Position: refs/heads/master@{#358531}
-rw-r--r--DEPS2
-rw-r--r--third_party/libvpx_new/README.chromium4
-rw-r--r--third_party/libvpx_new/source/config/vpx_version.h6
3 files changed, 6 insertions, 6 deletions
diff --git a/DEPS b/DEPS
index 6e77ba1c..0a0b968 100644
--- a/DEPS
+++ b/DEPS
@@ -187,7 +187,7 @@ deps = {
Var('chromium_git') + '/external/selenium/py.git' + '@' + '5fd78261a75fe08d27ca4835fb6c5ce4b42275bd',
'src/third_party/libvpx_new/source/libvpx':
- Var('chromium_git') + '/webm/libvpx.git' + '@' + 'c6641709a707ccb98cbdf785428659e44d4f2c8b',
+ Var('chromium_git') + '/webm/libvpx.git' + '@' + 'eba14ddbe7e7b69803dab770ba25ae2ba75c65e2',
'src/third_party/ffmpeg':
Var('chromium_git') + '/chromium/third_party/ffmpeg.git' + '@' + 'd2733b2c43f65f0e779d5d014777fb8ea1e89873',
diff --git a/third_party/libvpx_new/README.chromium b/third_party/libvpx_new/README.chromium
index a494111..70b04b5 100644
--- a/third_party/libvpx_new/README.chromium
+++ b/third_party/libvpx_new/README.chromium
@@ -5,9 +5,9 @@ License: BSD
License File: source/libvpx/LICENSE
Security Critical: yes
-Date: Wednesday November 4 2015
+Date: Friday November 6 2015
Branch: master
-Commit: c6641709a707ccb98cbdf785428659e44d4f2c8b
+Commit: eba14ddbe7e7b69803dab770ba25ae2ba75c65e2
Description:
Contains the sources used to compile libvpx binaries used by Google Chrome and
diff --git a/third_party/libvpx_new/source/config/vpx_version.h b/third_party/libvpx_new/source/config/vpx_version.h
index b5c4b1f..7b83a66 100644
--- a/third_party/libvpx_new/source/config/vpx_version.h
+++ b/third_party/libvpx_new/source/config/vpx_version.h
@@ -1,7 +1,7 @@
#define VERSION_MAJOR 1
#define VERSION_MINOR 4
#define VERSION_PATCH 0
-#define VERSION_EXTRA "1647-gc664170"
+#define VERSION_EXTRA "1655-geba14dd"
#define VERSION_PACKED ((VERSION_MAJOR<<16)|(VERSION_MINOR<<8)|(VERSION_PATCH))
-#define VERSION_STRING_NOSP "v1.4.0-1647-gc664170"
-#define VERSION_STRING " v1.4.0-1647-gc664170"
+#define VERSION_STRING_NOSP "v1.4.0-1655-geba14dd"
+#define VERSION_STRING " v1.4.0-1655-geba14dd"