summaryrefslogtreecommitdiffstats
path: root/content
diff options
context:
space:
mode:
authorsergeyu@chromium.org <sergeyu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-10-17 23:14:48 +0000
committersergeyu@chromium.org <sergeyu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-10-17 23:14:48 +0000
commit26984f57e4dfe15e1c0a5ca117b94d1b49c75fad (patch)
tree613be2d565a48907ba1921555ec786372e54acaf /content
parent582e5f24a8e3e2c4ab0c3f9f59035d75855eccd5 (diff)
downloadchromium_src-26984f57e4dfe15e1c0a5ca117b94d1b49c75fad.zip
chromium_src-26984f57e4dfe15e1c0a5ca117b94d1b49c75fad.tar.gz
chromium_src-26984f57e4dfe15e1c0a5ca117b94d1b49c75fad.tar.bz2
Libjingle roll 85:88.
BUG=99575 TEST=None Review URL: http://codereview.chromium.org/8318027 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@105953 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content')
-rw-r--r--content/renderer/media/rtc_video_decoder_unittest.cc2
1 files changed, 2 insertions, 0 deletions
diff --git a/content/renderer/media/rtc_video_decoder_unittest.cc b/content/renderer/media/rtc_video_decoder_unittest.cc
index e75ad01..3ff5a75 100644
--- a/content/renderer/media/rtc_video_decoder_unittest.cc
+++ b/content/renderer/media/rtc_video_decoder_unittest.cc
@@ -65,6 +65,8 @@ class NullVideoFrame : public cricket::VideoFrame {
virtual void SetElapsedTime(int64 elapsed_time) OVERRIDE {}
virtual void SetTimeStamp(int64 time_stamp) OVERRIDE {}
+ virtual int GetRotation() const OVERRIDE { return 0; }
+
virtual VideoFrame *Copy() const OVERRIDE { return NULL; }
virtual bool MakeExclusive() OVERRIDE { return true; }