| Index: content/renderer/media/crypto/key_systems.cc
|
| diff --git a/content/renderer/media/crypto/key_systems.cc b/content/renderer/media/crypto/key_systems.cc
|
| index 4ce61227050c40d75b45f2aa96d139bfc4318eb5..5b6397145a6bc2a857c500b18841bd9a436a555c 100644
|
| --- a/content/renderer/media/crypto/key_systems.cc
|
| +++ b/content/renderer/media/crypto/key_systems.cc
|
| @@ -25,18 +25,19 @@ static std::string ToASCIIOrEmpty(const WebKit::WebString& string) {
|
| return IsStringASCII(string) ? UTF16ToASCII(string) : std::string();
|
| }
|
|
|
| -static const char kClearKeyKeySystem[] = "webkit-org.w3.clearkey";
|
| -
|
| -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 kClearKeyKeySystem[] = "webkit-org.w3.clearkey";
|
| +
|
| +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 kMp4aAvc1[] = "mp4a,avc1";
|
| +#endif // defined(USE_PROPRIETARY_CODECS)
|
|
|
| static void AddClearKey(std::vector<KeySystemInfo>* concrete_key_systems) {
|
| KeySystemInfo info(kClearKeyKeySystem);
|
|
|