Chromium Code Reviews| Index: media/media.gyp |
| diff --git a/media/media.gyp b/media/media.gyp |
| index 3cbb74f7b085924244ff6a1e8978337f6b5c5961..62f88986c4e6b24d3e5ce776a4d73450b325be0c 100644 |
| --- a/media/media.gyp |
| +++ b/media/media.gyp |
| @@ -37,8 +37,12 @@ |
| # Enable HEVC/H265 demuxing. Actual decoding must be provided by the |
| # platform. |
| 'enable_hevc_demuxing%': 1, |
| + # Enable AC3/EAC3 audio demuxing. Actual decoding must be provided by the |
|
ddorwin
2016/01/04 23:22:18
80 chars
servolk
2016/01/07 02:30:04
Do gyp files also have 80-char limit? I thought th
|
| + # platform (or HDMI sink in Chromecast for audio pass-through case). |
| + 'enable_ac3_eac3_demuxing%': 1, |
| }, { |
| 'enable_hevc_demuxing%': 0, |
| + 'enable_ac3_eac3_demuxing%': 0, |
| }], |
| ], |
| }, |
| @@ -1106,6 +1110,11 @@ |
| 'formats/mp4/hevc.h', |
| ], |
| }], |
| + ['proprietary_codecs==1 and enable_ac3_eac3_demuxing==1', { |
| + 'defines': [ |
| + 'ENABLE_AC3_EAC3_DEMUXING' |
| + ], |
| + }], |
| ['proprietary_codecs==1 and enable_hevc_demuxing==1 and media_use_ffmpeg==1', { |
| 'sources': [ |
| 'filters/ffmpeg_h265_to_annex_b_bitstream_converter.cc', |