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

Unified Diff: webrtc/video/encoder_state_feedback.cc

Issue 1510183002: Reland of Merge webrtc/video_engine/ into webrtc/video/ (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: rebase 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/encoder_state_feedback.h ('k') | webrtc/video/encoder_state_feedback_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webrtc/video/encoder_state_feedback.cc
diff --git a/webrtc/video_engine/encoder_state_feedback.cc b/webrtc/video/encoder_state_feedback.cc
similarity index 97%
rename from webrtc/video_engine/encoder_state_feedback.cc
rename to webrtc/video/encoder_state_feedback.cc
index 16ee8b95fc37a5e39580f77283eb445a509bff33..c0c4b67dbd0d12af3960e76a0c33f25d1d53b7c7 100644
--- a/webrtc/video_engine/encoder_state_feedback.cc
+++ b/webrtc/video/encoder_state_feedback.cc
@@ -8,14 +8,14 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "webrtc/video_engine/encoder_state_feedback.h"
+#include "webrtc/video/encoder_state_feedback.h"
#include <assert.h>
#include "webrtc/base/checks.h"
#include "webrtc/modules/rtp_rtcp/include/rtp_rtcp_defines.h"
#include "webrtc/system_wrappers/include/critical_section_wrapper.h"
-#include "webrtc/video_engine/vie_encoder.h"
+#include "webrtc/video/vie_encoder.h"
namespace webrtc {
« no previous file with comments | « webrtc/video/encoder_state_feedback.h ('k') | webrtc/video/encoder_state_feedback_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698