diff options
| author | buildbot@webrtc.org <buildbot@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d> | 2014-07-29 17:36:52 +0000 |
|---|---|---|
| committer | buildbot@webrtc.org <buildbot@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d> | 2014-07-29 17:36:52 +0000 |
| commit | d4e598d57aed714a599444a7eab5e8fdde52a950 (patch) | |
| tree | 67b1dcdcff833ff9e790a23ae35f5f1edeea0c28 /talk/media/base/videoframe.h | |
| parent | fc8b0871d9142bb2ca66d4e6ebb278083141e9d3 (diff) | |
| download | webrtc-d4e598d57aed714a599444a7eab5e8fdde52a950.tar.gz | |
(Auto)update libjingle 72097588-> 72159069
git-svn-id: http://webrtc.googlecode.com/svn/trunk@6799 4adac7df-926f-26a2-2b94-8c16560cd09d
Diffstat (limited to 'talk/media/base/videoframe.h')
| -rw-r--r-- | talk/media/base/videoframe.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/talk/media/base/videoframe.h b/talk/media/base/videoframe.h index fe5ff01ef8..d94e47081c 100644 --- a/talk/media/base/videoframe.h +++ b/talk/media/base/videoframe.h @@ -28,8 +28,8 @@ #ifndef TALK_MEDIA_BASE_VIDEOFRAME_H_ #define TALK_MEDIA_BASE_VIDEOFRAME_H_ -#include "talk/base/basictypes.h" -#include "talk/base/stream.h" +#include "webrtc/base/basictypes.h" +#include "webrtc/base/stream.h" namespace cricket { @@ -126,10 +126,10 @@ class VideoFrame { virtual void CopyToFrame(VideoFrame* target) const; // Writes the frame into the given stream and returns the StreamResult. - // See talk/base/stream.h for a description of StreamResult and error. + // See webrtc/base/stream.h for a description of StreamResult and error. // Error may be NULL. If a non-success value is returned from // StreamInterface::Write(), we immediately return with that value. - virtual talk_base::StreamResult Write(talk_base::StreamInterface *stream, + virtual rtc::StreamResult Write(rtc::StreamInterface *stream, int *error); // Converts the I420 data to RGB of a certain type such as ARGB and ABGR. |