content/content_common.gypi - Issue 1805723002: Reland: H264 HW encode using VideoToolbox

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/content_common.gypi

Issue 1805723002: Reland: H264 HW encode using VideoToolbox (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Fix gyp. Created 4 years, 9 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: content/content_common.gypi

diff --git a/content/content_common.gypi b/content/content_common.gypi

index 89678de8d480853d0fa797be36d7744dc1dc7bd0..49528ef8abb26d0e1e182cf3331e254f516e3c99 100644

--- a/content/content_common.gypi

+++ b/content/content_common.gypi

@@ -216,8 +216,8 @@

'public/common/webplugininfo.h',

'public/common/window_container_type.cc',

'public/common/window_container_type.h',

- 'public/common/zygote_handle.h',

'public/common/zygote_fork_delegate_linux.h',

+ 'public/common/zygote_handle.h',

'private_common_sources': [

'common/accessibility_messages.h',

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

'common/gpu/media/vt_mac.h',

'common/gpu/media/vt_video_decode_accelerator_mac.cc',

'common/gpu/media/vt_video_decode_accelerator_mac.h',

+ 'common/gpu/media/vt_video_encode_accelerator_mac.cc',

+ 'common/gpu/media/vt_video_encode_accelerator_mac.h',

'sources!': [

'common/plugin_list_posix.cc',

@@ -878,10 +880,10 @@

'common/gpu/media/h264_dpb.h',

'common/gpu/media/vp8_decoder.cc',

'common/gpu/media/vp8_decoder.h',

- 'common/gpu/media/vp9_decoder.cc',

- 'common/gpu/media/vp9_decoder.h',

'common/gpu/media/vp8_picture.cc',

'common/gpu/media/vp8_picture.h',

+ 'common/gpu/media/vp9_decoder.cc',

+ 'common/gpu/media/vp9_decoder.h',

'common/gpu/media/vp9_picture.cc',

'common/gpu/media/vp9_picture.h',