| Index: webrtc/api/java/jni/androidmediadecoder_jni.cc
|
| diff --git a/talk/app/webrtc/java/jni/androidmediadecoder_jni.cc b/webrtc/api/java/jni/androidmediadecoder_jni.cc
|
| similarity index 99%
|
| rename from talk/app/webrtc/java/jni/androidmediadecoder_jni.cc
|
| rename to webrtc/api/java/jni/androidmediadecoder_jni.cc
|
| index e46750fe6c45c1508b20a149d9af4ba733f45ead..a8197f03ff4dc4f166e4132e03fced1e3491a2da 100644
|
| --- a/talk/app/webrtc/java/jni/androidmediadecoder_jni.cc
|
| +++ b/webrtc/api/java/jni/androidmediadecoder_jni.cc
|
| @@ -29,11 +29,15 @@
|
| #include <algorithm>
|
| #include <vector>
|
|
|
| -#include "talk/app/webrtc/java/jni/androidmediadecoder_jni.h"
|
| -#include "talk/app/webrtc/java/jni/androidmediacodeccommon.h"
|
| -#include "talk/app/webrtc/java/jni/classreferenceholder.h"
|
| -#include "talk/app/webrtc/java/jni/native_handle_impl.h"
|
| -#include "talk/app/webrtc/java/jni/surfacetexturehelper_jni.h"
|
| +#include "webrtc/api/java/jni/androidmediadecoder_jni.h"
|
| + // androidmediadecoder_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 "webrtc/api/java/jni/surfacetexturehelper_jni.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"
|
| @@ -44,9 +48,6 @@
|
| #include "webrtc/modules/video_coding/include/video_codec_interface.h"
|
| #include "webrtc/system_wrappers/include/logcat_trace_context.h"
|
| #include "webrtc/system_wrappers/include/tick_util.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;
|
|
|