Index: webrtc/api/java/jni/androidmediaencoder_jni.cc |
diff --git a/talk/app/webrtc/java/jni/androidmediaencoder_jni.cc b/webrtc/api/java/jni/androidmediaencoder_jni.cc |
similarity index 99% |
rename from talk/app/webrtc/java/jni/androidmediaencoder_jni.cc |
rename to webrtc/api/java/jni/androidmediaencoder_jni.cc |
index e87abaf5a5d5a74ce6063aba938b6af6214ac9c2..ef3a06d4095aca00c06a3d751400c482f845fc00 100644 |
--- a/talk/app/webrtc/java/jni/androidmediaencoder_jni.cc |
+++ b/webrtc/api/java/jni/androidmediaencoder_jni.cc |
@@ -26,10 +26,14 @@ |
* |
*/ |
-#include "talk/app/webrtc/java/jni/androidmediaencoder_jni.h" |
-#include "talk/app/webrtc/java/jni/classreferenceholder.h" |
-#include "talk/app/webrtc/java/jni/androidmediacodeccommon.h" |
-#include "talk/app/webrtc/java/jni/native_handle_impl.h" |
+#include "webrtc/api/java/jni/androidmediaencoder_jni.h" |
+ // androidmediaencoder_jni.h must be included before the below. |
+#include "webrtc/api/java/jni/androidmediacodeccommon.h" |
+#include "webrtc/api/java/jni/classreferenceholder.h" |
+#include "webrtc/api/java/jni/native_handle_impl.h" |
+#include "third_party/libyuv/include/libyuv/convert.h" |
+#include "third_party/libyuv/include/libyuv/convert_from.h" |
+#include "third_party/libyuv/include/libyuv/video_common.h" |
#include "webrtc/base/bind.h" |
#include "webrtc/base/checks.h" |
#include "webrtc/base/logging.h" |
@@ -42,9 +46,6 @@ |
#include "webrtc/modules/video_coding/utility/vp8_header_parser.h" |
#include "webrtc/system_wrappers/include/field_trial.h" |
#include "webrtc/system_wrappers/include/logcat_trace_context.h" |
-#include "third_party/libyuv/include/libyuv/convert.h" |
-#include "third_party/libyuv/include/libyuv/convert_from.h" |
-#include "third_party/libyuv/include/libyuv/video_common.h" |
using rtc::Bind; |
using rtc::Thread; |