Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(232)

Unified Diff: webrtc/media/webrtc/webrtcvideoframe.h

Issue 1587193006: Move talk/media to webrtc/media (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Rebased to b647aca12a884a13c1728118586245399b55fa3d (#11493) Created 4 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « webrtc/media/webrtc/webrtcvideoengine2_unittest.cc ('k') | webrtc/media/webrtc/webrtcvideoframe.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webrtc/media/webrtc/webrtcvideoframe.h
diff --git a/talk/media/webrtc/webrtcvideoframe.h b/webrtc/media/webrtc/webrtcvideoframe.h
similarity index 96%
rename from talk/media/webrtc/webrtcvideoframe.h
rename to webrtc/media/webrtc/webrtcvideoframe.h
index 33d28738749b16c1bf92c802ad08c6c3ac5e3015..319f9c79ad87c765356a108425f525ef64ffbafe 100644
--- a/talk/media/webrtc/webrtcvideoframe.h
+++ b/webrtc/media/webrtc/webrtcvideoframe.h
@@ -25,15 +25,15 @@
* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#ifndef TALK_MEDIA_WEBRTCVIDEOFRAME_H_
-#define TALK_MEDIA_WEBRTCVIDEOFRAME_H_
+#ifndef WEBRTC_MEDIA_WEBRTC_WEBRTCVIDEOFRAME_H_
+#define WEBRTC_MEDIA_WEBRTC_WEBRTCVIDEOFRAME_H_
-#include "talk/media/base/videoframe.h"
#include "webrtc/base/buffer.h"
#include "webrtc/base/refcount.h"
#include "webrtc/base/scoped_ref_ptr.h"
#include "webrtc/common_types.h"
#include "webrtc/common_video/include/video_frame_buffer.h"
+#include "webrtc/media/base/videoframe.h"
namespace cricket {
@@ -135,4 +135,4 @@ class WebRtcVideoFrame : public VideoFrame {
} // namespace cricket
-#endif // TALK_MEDIA_WEBRTCVIDEOFRAME_H_
+#endif // WEBRTC_MEDIA_WEBRTC_WEBRTCVIDEOFRAME_H_
« no previous file with comments | « webrtc/media/webrtc/webrtcvideoengine2_unittest.cc ('k') | webrtc/media/webrtc/webrtcvideoframe.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698