diff options
| author | Torne (Richard Coles) <torne@google.com> | 2013-05-09 18:35:53 +0100 |
|---|---|---|
| committer | Torne (Richard Coles) <torne@google.com> | 2013-05-13 13:57:14 +0100 |
| commit | c2e0dbddbe15c98d52c4786dac06cb8952a8ae6d (patch) | |
| tree | 1dbdbb0624cc869ab25ee7f46971984c6fee3e7a /media/base/media_log.h | |
| parent | 2d519ce2457219605d4f472da8d2ffd469796035 (diff) | |
| download | chromium_org-c2e0dbddbe15c98d52c4786dac06cb8952a8ae6d.tar.gz | |
Merge from Chromium at DEPS revision r198571
This commit was generated by merge_to_master.py.
Change-Id: I951118a03836157090561764dd2627f0add8118f
Diffstat (limited to 'media/base/media_log.h')
| -rw-r--r-- | media/base/media_log.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/media/base/media_log.h b/media/base/media_log.h index e776ef6a8b..191de33b56 100644 --- a/media/base/media_log.h +++ b/media/base/media_log.h @@ -64,7 +64,7 @@ class MEDIA_EXPORT MediaLog : public base::RefCountedThreadSafe<MediaLog> { scoped_ptr<MediaLogEvent> CreateVideoSizeSetEvent( size_t width, size_t height); scoped_ptr<MediaLogEvent> CreateBufferedExtentsChangedEvent( - size_t start, size_t current, size_t end); + int64 start, int64 current, int64 end); scoped_ptr<MediaLogEvent> CreateMediaSourceErrorEvent( const std::string& error); |