diff options
| author | scherkus@chromium.org <scherkus@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-05-10 17:04:48 +0000 |
|---|---|---|
| committer | scherkus@chromium.org <scherkus@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-05-10 17:04:48 +0000 |
| commit | d01120e6c225d4922d0f932ab6ef4f3709dcaa17 (patch) | |
| tree | 98a448a7adb6bc5a581861a4ff255d6bd5fb04aa /net | |
| parent | 3264fc3cf0162e1d2302b31afc55c8c3d7aef71d (diff) | |
| download | chromium_src-d01120e6c225d4922d0f932ab6ef4f3709dcaa17.zip chromium_src-d01120e6c225d4922d0f932ab6ef4f3709dcaa17.tar.gz chromium_src-d01120e6c225d4922d0f932ab6ef4f3709dcaa17.tar.bz2 | |
Added #ifdef to allow Chromium to enable proprietary codecs.
We need to enable MP4 and MP3 support on tegra2 boards. This change will let us enable this support via a flag in make.conf.
Patch by jneddo@nvidia.com:
http://codereview.chromium.org/1942003/show
BUG=none
TEST=none
Review URL: http://codereview.chromium.org/2001004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@46824 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net')
| -rw-r--r-- | net/base/mime_util.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/base/mime_util.cc b/net/base/mime_util.cc index aa3934b..5d975e6 100644 --- a/net/base/mime_util.cc +++ b/net/base/mime_util.cc @@ -189,7 +189,7 @@ static const char* const supported_media_types[] = { "audio/ogg", "application/ogg", -#if defined(GOOGLE_CHROME_BUILD) +#if defined(GOOGLE_CHROME_BUILD) || defined(USE_PROPRIETARY_CODECS) // MPEG-4. "video/mp4", "video/x-m4v", @@ -208,7 +208,7 @@ static const char* const supported_media_types[] = { // Refer to http://wiki.whatwg.org/wiki/Video_type_parameters#Browser_Support // for more information. static const char* const supported_media_codecs[] = { -#if defined(GOOGLE_CHROME_BUILD) +#if defined(GOOGLE_CHROME_BUILD) || defined(USE_PROPRIETARY_CODECS) "avc1", "mp4a", #endif |