| Index: media/media.gyp
|
| diff --git a/media/media.gyp b/media/media.gyp
|
| index 57695cd5cedab85f1ab5f9d5b591941c17730936..0c4df9174bf265e3e3798949dc881ea46b17c972 100644
|
| --- a/media/media.gyp
|
| +++ b/media/media.gyp
|
| @@ -671,6 +671,20 @@
|
| ],
|
| },
|
| }],
|
| + ['proprietary_codecs==1 and enable_hevc_demuxing==1', {
|
| + 'sources': [
|
| + 'filters/h265_parser.cc',
|
| + 'filters/h265_parser.h',
|
| + 'formats/mp4/hevc.cc',
|
| + 'formats/mp4/hevc.h',
|
| + ],
|
| + }],
|
| + ['media_use_ffmpeg==1 and proprietary_codecs==1 and enable_hevc_demuxing==1', {
|
| + 'sources': [
|
| + 'filters/ffmpeg_h265_to_annex_b_bitstream_converter.cc',
|
| + 'filters/ffmpeg_h265_to_annex_b_bitstream_converter.h',
|
| + ],
|
| + }],
|
| ['media_use_libvpx==1', {
|
| 'dependencies': [
|
| '<(DEPTH)/third_party/libvpx/libvpx.gyp:libvpx',
|
| @@ -1277,6 +1291,11 @@
|
| 'USE_NEON'
|
| ],
|
| }],
|
| + ['proprietary_codecs==1 and enable_hevc_demuxing==1', {
|
| + 'sources': [
|
| + 'filters/h265_parser_unittest.cc',
|
| + ],
|
| + }],
|
| ['media_use_ffmpeg==1', {
|
| 'dependencies': [
|
| '../third_party/ffmpeg/ffmpeg.gyp:ffmpeg',
|
|
|