content/common/gpu/media/avda_shared_state.h - 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: content/common/gpu/media/avda_shared_state.h

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

« no previous file with comments | « content/common/gpu/media/android_video_encode_accelerator.cc ('k') | content/renderer/media/webrtc/peer_connection_dependency_factory.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/common/gpu/media/avda_shared_state.h

diff --git a/content/common/gpu/media/avda_shared_state.h b/content/common/gpu/media/avda_shared_state.h

index 474037dfa5d108e40e9580b47316e2de2e45a330..a64bf3aac300a6839685446c85a80a11223ae000 100644

--- a/content/common/gpu/media/avda_shared_state.h

+++ b/content/common/gpu/media/avda_shared_state.h

@@ -6,7 +6,7 @@

#define CONTENT_COMMON_GPU_AVDA_SHARED_STATE_H_

#include "gpu/command_buffer/service/gles2_cmd_decoder.h"

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

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

#include "ui/gl/gl_image.h"

namespace gfx {