chrome/renderer/media/chrome_key_systems.cc - Issue 28053006: mac: Fix build with ffmpeg_branding=Chrome proprietary_codecs=1.

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: chrome/renderer/media/chrome_key_systems.cc

Issue 28053006: mac: Fix build with ffmpeg_branding=Chrome proprietary_codecs=1. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 7 years, 2 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: chrome/renderer/media/chrome_key_systems.cc

diff --git a/chrome/renderer/media/chrome_key_systems.cc b/chrome/renderer/media/chrome_key_systems.cc

index c169d5393a26746508e13dc50291e872c80c1313..4e1577565bcecd3e041dc039d06f1115b53b2c76 100644

--- a/chrome/renderer/media/chrome_key_systems.cc

+++ b/chrome/renderer/media/chrome_key_systems.cc

@@ -36,7 +36,9 @@ const char kVorbisVP8[] = "vorbis,vp8,vp8.0";

const char kAudioMp4[] = "audio/mp4";

const char kVideoMp4[] = "video/mp4";

const char kMp4a[] = "mp4a";

+#if defined(WIDEVINE_CDM_AVAILABLE)

const char kAvc1Avc3[] = "avc1,avc3";

acolwell GONE FROM CHROMIUM 2013/10/18 21:41:18 nit: How about just moving this into the #ifdef be

Nico 2013/10/18 21:43:12 Done.

Nico 2013/10/18 21:43:12 Does that change much? Down there it'd have to be

acolwell GONE FROM CHROMIUM 2013/10/18 21:45:55 Oh right. How about just inlining this since it is

+#endif // WIDEVINE_CDM_AVAILABLE

const char kMp4aAvc1Avc3[] = "mp4a,avc1,avc3";

#endif // defined(USE_PROPRIETARY_CODECS)

« no previous file with comments | « no previous file | no next file » | no next file with comments »