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

Unified Diff: webrtc/video_engine/vie_receiver.cc

Issue 1507903005: Revert of Merge webrtc/video_engine/ into webrtc/video/ (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Resolved merge conflict Created 5 years 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/video_engine/vie_receiver.h ('k') | webrtc/video_engine/vie_remb.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webrtc/video_engine/vie_receiver.cc
diff --git a/webrtc/video/vie_receiver.cc b/webrtc/video_engine/vie_receiver.cc
similarity index 99%
rename from webrtc/video/vie_receiver.cc
rename to webrtc/video_engine/vie_receiver.cc
index 98c8c5dbc09dfb50fd891e7528bff1e2d2ca42a2..56dfb28f15ba8c314b525e0b8981d16479e71849 100644
--- a/webrtc/video/vie_receiver.cc
+++ b/webrtc/video_engine/vie_receiver.cc
@@ -8,7 +8,7 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "webrtc/video/vie_receiver.h"
+#include "webrtc/video_engine/vie_receiver.h"
#include <vector>
« no previous file with comments | « webrtc/video_engine/vie_receiver.h ('k') | webrtc/video_engine/vie_remb.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698