summaryrefslogtreecommitdiff
path: root/media/base/vector_math.h
diff options
context:
space:
mode:
authorTorne (Richard Coles) <torne@google.com>2014-03-18 10:20:56 +0000
committerTorne (Richard Coles) <torne@google.com>2014-03-18 10:20:56 +0000
commita1401311d1ab56c4ed0a474bd38c108f75cb0cd9 (patch)
tree3437151d9ae1ce20a1e53a0d98c19ca01c786394 /media/base/vector_math.h
parentaf5066f1e36c6579e74752647e6c584438f80f94 (diff)
downloadchromium_org-a1401311d1ab56c4ed0a474bd38c108f75cb0cd9.tar.gz
Merge from Chromium at DEPS revision 257591
This commit was generated by merge_to_master.py. Change-Id: I0010df2ec3fbb5d4947cd026de2feb150ce7a6b5
Diffstat (limited to 'media/base/vector_math.h')
-rw-r--r--media/base/vector_math.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/media/base/vector_math.h b/media/base/vector_math.h
index a4dea37289..0a2cb06f6b 100644
--- a/media/base/vector_math.h
+++ b/media/base/vector_math.h
@@ -38,6 +38,8 @@ MEDIA_EXPORT void FMUL(const float src[], float scale, int len, float dest[]);
MEDIA_EXPORT std::pair<float, float> EWMAAndMaxPower(
float initial_value, const float src[], int len, float smoothing_factor);
+MEDIA_EXPORT void Crossfade(const float src[], int len, float dest[]);
+
} // namespace vector_math
} // namespace media