| 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 173fd046d55aca2d33b57a5d5cc9d24f43dcbe3a..c12a3ed6621c4f3176464af17dc8b145680416c8 100644
|
| --- a/chrome/renderer/media/chrome_key_systems.cc
|
| +++ b/chrome/renderer/media/chrome_key_systems.cc
|
| @@ -25,16 +25,18 @@
|
|
|
| using content::KeySystemInfo;
|
|
|
| -static const char kAudioWebM[] = "audio/webm";
|
| -static const char kVideoWebM[] = "video/webm";
|
| -static const char kVorbis[] = "vorbis";
|
| -static const char kVorbisVP8[] = "vorbis,vp8,vp8.0";
|
| -
|
| -static const char kAudioMp4[] = "audio/mp4";
|
| -static const char kVideoMp4[] = "video/mp4";
|
| -static const char kMp4a[] = "mp4a";
|
| -static const char kAvc1[] = "avc1";
|
| -static const char kMp4aAvc1[] = "mp4a,avc1";
|
| +const char kAudioWebM[] = "audio/webm";
|
| +const char kVideoWebM[] = "video/webm";
|
| +const char kVorbis[] = "vorbis";
|
| +const char kVorbisVP8[] = "vorbis,vp8,vp8.0";
|
| +
|
| +#if defined(USE_PROPRIETARY_CODECS)
|
| +const char kAudioMp4[] = "audio/mp4";
|
| +const char kVideoMp4[] = "video/mp4";
|
| +const char kMp4a[] = "mp4a";
|
| +const char kAvc1[] = "avc1";
|
| +const char kMp4aAvc1[] = "mp4a,avc1";
|
| +#endif // defined(USE_PROPRIETARY_CODECS)
|
|
|
| #if defined(ENABLE_PEPPER_CDMS)
|
| static bool IsPepperCdmRegistered(const std::string& pepper_type) {
|
|
|