| Index: talk/app/webrtc/java/jni/androidmediaencoder_jni.cc
|
| diff --git a/talk/app/webrtc/java/jni/androidmediaencoder_jni.cc b/talk/app/webrtc/java/jni/androidmediaencoder_jni.cc
|
| index 7f558c0551b07e657d2163df58167a4734ecf06d..8e3a64e7aa2d511466e141174e6a29c2f2c264df 100644
|
| --- a/talk/app/webrtc/java/jni/androidmediaencoder_jni.cc
|
| +++ b/talk/app/webrtc/java/jni/androidmediaencoder_jni.cc
|
| @@ -27,9 +27,12 @@
|
| */
|
|
|
| #include "talk/app/webrtc/java/jni/androidmediaencoder_jni.h"
|
| +#include "talk/app/webrtc/java/jni/androidmediacodeccommon.h" // No not sort.
|
| #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 "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"
|
| @@ -41,9 +44,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;
|
|
|