media/base/mac/coremedia_glue.mm - Issue 518313003: Move Mac media glue code from media/video/capture/mac to media/base/mac

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/mac/coremedia_glue.mm

Issue 518313003: Move Mac media glue code from media/video/capture/mac to media/base/mac (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Move media glue code back to base/mac and add suitable rules in build files to compile the code for… Created 6 years, 3 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:

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

Download patch

Index: media/base/mac/coremedia_glue.mm

diff --git a/media/video/capture/mac/coremedia_glue.mm b/media/base/mac/coremedia_glue.mm

similarity index 98%

rename from media/video/capture/mac/coremedia_glue.mm

rename to media/base/mac/coremedia_glue.mm

index 1bb4b8d0b0f05e265993c398829bb19f23cdef63..6716e756d2adde9faa1ac019d821d94ac9ec2a4f 100644

--- a/media/video/capture/mac/coremedia_glue.mm

+++ b/media/base/mac/coremedia_glue.mm

@@ -2,9 +2,10 @@

// Use of this source code is governed by a BSD-style license that can be

// found in the LICENSE file.

-#include "media/video/capture/mac/coremedia_glue.h"

+#include "media/base/mac/coremedia_glue.h"

#include <dlfcn.h>

+#import <Foundation/Foundation.h>

#include "base/logging.h"

#include "base/lazy_instance.h"

« media/BUILD.gn ('K') | « media/base/mac/coremedia_glue.h ('k') | media/media.gyp » ('j') | media/media.gyp » ('J')