media/base/android/media_codec_video_decoder.cc - Issue 1525003002: Revert of Refactor MediaCodecBridge to add support for NDK APIs

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: media/base/android/media_codec_video_decoder.cc

Issue 1525003002: Revert of Refactor MediaCodecBridge to add support for NDK APIs (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: fix rebase errors Created 5 years ago

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

Jump to:

View side-by-side diff with in-line comments

Download patch

Index: media/base/android/media_codec_video_decoder.cc

diff --git a/media/base/android/media_codec_video_decoder.cc b/media/base/android/media_codec_video_decoder.cc

index 928f2e74ef732680754638f0c927d32a96ae9b49..f20bbebe210ed995831a2ade66dceb64a0da4501 100644

--- a/media/base/android/media_codec_video_decoder.cc

+++ b/media/base/android/media_codec_video_decoder.cc

@@ -6,8 +6,8 @@

#include "base/bind.h"

#include "base/logging.h"

+#include "media/base/android/media_codec_bridge.h"

#include "media/base/android/media_statistics.h"

-#include "media/base/android/sdk_media_codec_bridge.h"

#include "media/base/demuxer_stream.h"

#include "media/base/timestamp_constants.h"

« no previous file with comments | « media/base/android/media_codec_util.cc ('k') | media/base/android/media_decoder_job.cc » ('j') | no next file with comments »