diff options
| author | dalecurtis <dalecurtis@chromium.org> | 2014-10-23 12:26:44 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2014-10-23 19:27:50 +0000 |
| commit | 6e3c3794e833bc10208e499971c137ec527eb837 (patch) | |
| tree | da2a6cdd7d20cceab514f4eaee48f71353555601 /media | |
| parent | fc77422bad34bd26784f9affc9e2b07f1067997b (diff) | |
| download | chromium_src-6e3c3794e833bc10208e499971c137ec527eb837.zip chromium_src-6e3c3794e833bc10208e499971c137ec527eb837.tar.gz chromium_src-6e3c3794e833bc10208e499971c137ec527eb837.tar.bz2 | |
Move proprietary codecs flag into root features config.
The USE_PROPRIETARY_CODECS #define is unfortunately sprinkled
all over: net/, media/, content/, chrome/, components/, and
third_party/widevine... so limiting it to just the media
features config was incorrect.
BUG=none
TEST=MediaSource works properly.
Review URL: https://codereview.chromium.org/672303002
Cr-Commit-Position: refs/heads/master@{#300928}
Diffstat (limited to 'media')
| -rw-r--r-- | media/BUILD.gn | 6 | ||||
| -rw-r--r-- | media/media_options.gni | 3 |
2 files changed, 2 insertions, 7 deletions
diff --git a/media/BUILD.gn b/media/BUILD.gn index fdaae40..280dc3d 100644 --- a/media/BUILD.gn +++ b/media/BUILD.gn @@ -4,8 +4,9 @@ import("//build/config/android/config.gni") import("//build/config/arm.gni") -import("//build/config/ui.gni") +import("//build/config/features.gni") import("//build/config/linux/pkg_config.gni") +import("//build/config/ui.gni") import("//media/media_options.gni") # Common configuration for targets in the media directory. @@ -31,9 +32,6 @@ config("media_dependent_config") { if (!media_use_libvpx) { defines += [ "MEDIA_DISABLE_LIBVPX" ] } - if (proprietary_codecs) { - defines += [ "USE_PROPRIETARY_CODECS" ] - } if (is_win) { ldflags = [ "/DELAYLOAD:mf.dll", diff --git a/media/media_options.gni b/media/media_options.gni index dfc653b..c2b4709 100644 --- a/media/media_options.gni +++ b/media/media_options.gni @@ -3,9 +3,6 @@ # found in the LICENSE file. declare_args() { - # Enables proprietary codecs and demuxers; e.g. H264, MOV, AAC, and MP3. - proprietary_codecs = false - # Allows distributions to link pulseaudio directly (DT_NEEDED) instead of # using dlopen. This helps with automated detection of ABI mismatches and # prevents silent errors. |