talk/app/webrtc/java/jni/androidmediadecoder_jni.cc - Issue 1587193006: Move talk/media to webrtc/media

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: talk/app/webrtc/java/jni/androidmediadecoder_jni.cc

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

Patch Set: Disable sign-compare warning on Win Clang Created 4 years, 11 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: talk/app/webrtc/java/jni/androidmediadecoder_jni.cc

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

index e46750fe6c45c1508b20a149d9af4ba733f45ead..e8eedf513073de6190c1eb2d029bf6bc55502eb2 100644

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

+++ b/talk/app/webrtc/java/jni/androidmediadecoder_jni.cc

@@ -30,10 +30,13 @@

#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/androidmediacodeccommon.h" // No not sort.

Taylor Brandstetter 2016/01/27 02:39:42 What does "no not sort" mean?

kjellander_webrtc 2016/02/04 21:52:10 Ah, bad typo there. I ran into build errors when s

#include "talk/app/webrtc/java/jni/native_handle_impl.h"

#include "talk/app/webrtc/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 +47,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;