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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: webrtc/video_engine/vie_encoder.h

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_codec_unittest.cc ('k') | webrtc/video_engine/vie_encoder.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webrtc/video_engine/vie_encoder.h
diff --git a/webrtc/video/vie_encoder.h b/webrtc/video_engine/vie_encoder.h
similarity index 98%
rename from webrtc/video/vie_encoder.h
rename to webrtc/video_engine/vie_encoder.h
index b86287c1296eef7f14e6bd04595fe13f551b9f4c..9e6257a1d5438b1a420969420dab32ebbcec1c95 100644
--- a/webrtc/video/vie_encoder.h
+++ b/webrtc/video_engine/vie_encoder.h
@@ -8,8 +8,8 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#ifndef WEBRTC_VIDEO_VIE_ENCODER_H_
-#define WEBRTC_VIDEO_VIE_ENCODER_H_
+#ifndef WEBRTC_VIDEO_ENGINE_VIE_ENCODER_H_
+#define WEBRTC_VIDEO_ENGINE_VIE_ENCODER_H_
#include <map>
#include <vector>
@@ -192,4 +192,4 @@ class ViEEncoder : public RtcpIntraFrameObserver,
} // namespace webrtc
-#endif // WEBRTC_VIDEO_VIE_ENCODER_H_
+#endif // WEBRTC_VIDEO_ENGINE_VIE_ENCODER_H_
« no previous file with comments | « webrtc/video_engine/vie_codec_unittest.cc ('k') | webrtc/video_engine/vie_encoder.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698