diff options
| author | dalecurtis <dalecurtis@chromium.org> | 2014-10-22 13:18:53 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2014-10-22 20:20:17 +0000 |
| commit | cede870bcc0e176edf2eebb8d379561005ce0420 (patch) | |
| tree | 1d3695ef56537e655ffdd4e57bfc7a4298b1d37a /media | |
| parent | 4b2564483acc015ade27f0afed45d05c94861199 (diff) | |
| download | chromium_src-cede870bcc0e176edf2eebb8d379561005ce0420.zip chromium_src-cede870bcc0e176edf2eebb8d379561005ce0420.tar.gz chromium_src-cede870bcc0e176edf2eebb8d379561005ce0420.tar.bz2 | |
Fix proprietary codecs builds for GN.
BUG=none
TEST=mojo plays mp3s.
Review URL: https://codereview.chromium.org/664303002
Cr-Commit-Position: refs/heads/master@{#300738}
Diffstat (limited to 'media')
| -rw-r--r-- | media/BUILD.gn | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/media/BUILD.gn b/media/BUILD.gn index 0f1291f..fdaae40 100644 --- a/media/BUILD.gn +++ b/media/BUILD.gn @@ -27,8 +27,12 @@ config("media_config") { } config("media_dependent_config") { + defines = [] if (!media_use_libvpx) { - defines = [ "MEDIA_DISABLE_LIBVPX" ] + defines += [ "MEDIA_DISABLE_LIBVPX" ] + } + if (proprietary_codecs) { + defines += [ "USE_PROPRIETARY_CODECS" ] } if (is_win) { ldflags = [ @@ -375,6 +379,8 @@ component("media") { if (proprietary_codecs) { sources += [ + "filters/h264_to_annex_b_bitstream_converter.cc", + "filters/h264_to_annex_b_bitstream_converter.h", "formats/mp2t/es_adapter_video.cc", "formats/mp2t/es_adapter_video.h", "formats/mp2t/es_parser.cc", |