webrtc/api/java/jni/androidmediadecoder_jni.h - Issue 1610243002: Move talk/app/webrtc to webrtc/api

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: webrtc/api/java/jni/androidmediadecoder_jni.h

Issue 1610243002: Move talk/app/webrtc to webrtc/api (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master

Patch Set: Removed processing of api.gyp for Chromium builds Created 4 years, 10 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

Index: webrtc/api/java/jni/androidmediadecoder_jni.h

diff --git a/talk/app/webrtc/java/jni/androidmediadecoder_jni.h b/webrtc/api/java/jni/androidmediadecoder_jni.h

similarity index 90%

rename from talk/app/webrtc/java/jni/androidmediadecoder_jni.h

rename to webrtc/api/java/jni/androidmediadecoder_jni.h

index b25ec137fcfc3909689234c44720ae3c58b80f4e..c79490e9c7ac82fc7adc3b9293e539eede920b27 100644

--- a/talk/app/webrtc/java/jni/androidmediadecoder_jni.h

+++ b/webrtc/api/java/jni/androidmediadecoder_jni.h

@@ -26,10 +26,10 @@

-#ifndef TALK_APP_WEBRTC_JAVA_JNI_ANDROIDMEDIADECODER_JNI_H_

-#define TALK_APP_WEBRTC_JAVA_JNI_ANDROIDMEDIADECODER_JNI_H_

+#ifndef WEBRTC_API_JAVA_JNI_ANDROIDMEDIADECODER_JNI_H_

+#define WEBRTC_API_JAVA_JNI_ANDROIDMEDIADECODER_JNI_H_

-#include "talk/app/webrtc/java/jni/eglbase_jni.h"

+#include "webrtc/api/java/jni/eglbase_jni.h"

#include "webrtc/media/webrtc/webrtcvideodecoderfactory.h"

namespace webrtc_jni {

@@ -56,4 +56,4 @@ class MediaCodecVideoDecoderFactory

} // namespace webrtc_jni

-#endif // TALK_APP_WEBRTC_JAVA_JNI_ANDROIDMEDIADECODER_JNI_H_

+#endif // WEBRTC_API_JAVA_JNI_ANDROIDMEDIADECODER_JNI_H_