commit 5ad129741cbf6c5e7789f41028798a90de2b34df
author kjellander@webrtc.org <kjellander@webrtc.org> Fri Feb 12 06:39:40 2016 +0100
committer kjellander@webrtc.org <kjellander@webrtc.org> Fri Feb 12 05:39:50 2016 +0000
tree 52185ed67e9c7cde413979f59638503535e5a9c4
parent f396f6085f9e4f16f37471a7828e3e31308c0d52

Rename webrtc/media/webrtc -> webrtc/media/engine

BUG=webrtc:5420
NOTRY=True
R=pthatcher@google.com, pthatcher@webrtc.org

Review URL: https://codereview.webrtc.org/1684163002 .

Cr-Commit-Position: refs/heads/master@{#11591}

webrtc/api/java/jni/androidmediadecoder_jni.h

diff --git a/webrtc/api/java/jni/androidmediadecoder_jni.h b/webrtc/api/java/jni/androidmediadecoder_jni.h
index 73df2ab..8ee23be 100644
--- a/webrtc/api/java/jni/androidmediadecoder_jni.h
+++ b/webrtc/api/java/jni/androidmediadecoder_jni.h
@@ -12,7 +12,7 @@
 #define WEBRTC_API_JAVA_JNI_ANDROIDMEDIADECODER_JNI_H_
 
 #include "webrtc/api/java/jni/eglbase_jni.h"
-#include "webrtc/media/webrtc/webrtcvideodecoderfactory.h"
+#include "webrtc/media/engine/webrtcvideodecoderfactory.h"
 
 namespace webrtc_jni {
 

webrtc/api/java/jni/androidmediaencoder_jni.h

diff --git a/webrtc/api/java/jni/androidmediaencoder_jni.h b/webrtc/api/java/jni/androidmediaencoder_jni.h
index d7908b4..c0b5f02 100644
--- a/webrtc/api/java/jni/androidmediaencoder_jni.h
+++ b/webrtc/api/java/jni/androidmediaencoder_jni.h
@@ -14,7 +14,7 @@
 #include <vector>
 
 #include "webrtc/api/java/jni/eglbase_jni.h"
-#include "webrtc/media/webrtc/webrtcvideoencoderfactory.h"
+#include "webrtc/media/engine/webrtcvideoencoderfactory.h"
 
 namespace webrtc_jni {
 

webrtc/api/java/jni/peerconnection_jni.cc

diff --git a/webrtc/api/java/jni/peerconnection_jni.cc b/webrtc/api/java/jni/peerconnection_jni.cc
index a19e79a..3997805 100644
--- a/webrtc/api/java/jni/peerconnection_jni.cc
+++ b/webrtc/api/java/jni/peerconnection_jni.cc
@@ -68,8 +68,8 @@
 #include "webrtc/media/base/videocapturer.h"
 #include "webrtc/media/base/videorenderer.h"
 #include "webrtc/media/devices/videorendererfactory.h"
-#include "webrtc/media/webrtc/webrtcvideodecoderfactory.h"
-#include "webrtc/media/webrtc/webrtcvideoencoderfactory.h"
+#include "webrtc/media/engine/webrtcvideodecoderfactory.h"
+#include "webrtc/media/engine/webrtcvideoencoderfactory.h"
 #include "webrtc/modules/video_render/video_render_internal.h"
 #include "webrtc/system_wrappers/include/field_trial_default.h"
 #include "webrtc/system_wrappers/include/logcat_trace_context.h"