Roll DEPS to get latest cdm.h

BUG=408328 Review URL: https://codereview.chromium.org/696453002 Cr-Commit-Position: refs/heads/master@{#302196}

Roll DEPS to get latest cdm.h
BUG=408328 Review URL: https://codereview.chromium.org/696453002 Cr-Commit-Position: refs/heads/master@{#302196}
f0ce5723 · jrummell · Commit bot · 7df471a6 · f0ce5723 · f0ce5723
Commit f0ce5723 authored Oct 30, 2014 by jrummell Committed by Commit bot Oct 31, 2014
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

DEPS DEPS +1 -1

media/cdm/ppapi/cdm_helpers.h media/cdm/ppapi/cdm_helpers.h +1 -1

No files found.
--- a/DEPS
+++ b/DEPS
@@ -284,7 +284,7 @@ deps = {
   Var('chromium_git') + '/chromium/deps/opus.git' + '@' + 'cae696156f1e60006e39821e79a1811ae1933c69',

  'src/media/cdm/ppapi/api':
-   Var('chromium_git') + '/chromium/cdm.git' + '@' + '41c8183a3966a17b440dbe606cb2840e1b7ce884',
+   Var('chromium_git') + '/chromium/cdm.git' + '@' + 'f924b6382b05c57677455ac40f210b33809591ef', # from svn revision 292736

  'src/third_party/mesa/src':
   Var('chromium_git') + '/chromium/deps/mesa.git' + '@' + '9731cb962963bca8a05f3d0f6ea40c3a781f0537',

--- a/media/cdm/ppapi/cdm_helpers.h
+++ b/media/cdm/ppapi/cdm_helpers.h
@@ -180,7 +180,7 @@ class VideoFrameImpl : public cdm::VideoFrame {
  DISALLOW_COPY_AND_ASSIGN(VideoFrameImpl);
 };

-class AudioFramesImpl : public cdm::AudioFrames_2 {
+class AudioFramesImpl : public cdm::AudioFrames {
 public:
  AudioFramesImpl() : buffer_(NULL), format_(cdm::kUnknownAudioFormat) {}
  virtual ~AudioFramesImpl() {