Index: media/media.gyp |
diff --git a/media/media.gyp b/media/media.gyp |
index a83911d55cb2d291c028bdc371b8c020a79a101e..3a008410a7e02b002b047a64a996270408e62cb7 100644 |
--- a/media/media.gyp |
+++ b/media/media.gyp |
@@ -656,6 +656,8 @@ |
'filters/ffmpeg_glue.h', |
'filters/ffmpeg_h264_to_annex_b_bitstream_converter.cc', |
'filters/ffmpeg_h264_to_annex_b_bitstream_converter.h', |
+ 'filters/ffmpeg_h265_to_annex_b_bitstream_converter.cc', |
+ 'filters/ffmpeg_h265_to_annex_b_bitstream_converter.h', |
'filters/ffmpeg_video_decoder.cc', |
'filters/ffmpeg_video_decoder.h', |
'filters/in_memory_url_protocol.cc', |
@@ -998,8 +1000,12 @@ |
'filters/ffmpeg_aac_bitstream_converter.h', |
'filters/ffmpeg_h264_to_annex_b_bitstream_converter.cc', |
'filters/ffmpeg_h264_to_annex_b_bitstream_converter.h', |
+ 'filters/ffmpeg_h265_to_annex_b_bitstream_converter.cc', |
+ 'filters/ffmpeg_h265_to_annex_b_bitstream_converter.h', |
'filters/h264_to_annex_b_bitstream_converter.cc', |
'filters/h264_to_annex_b_bitstream_converter.h', |
+ 'filters/h265_parser.cc', |
+ 'filters/h265_parser.h', |
'formats/mp2t/es_adapter_video.cc', |
'formats/mp2t/es_adapter_video.h', |
'formats/mp2t/es_parser.cc', |
@@ -1038,6 +1044,8 @@ |
'formats/mp4/cenc.h', |
'formats/mp4/es_descriptor.cc', |
'formats/mp4/es_descriptor.h', |
+ 'formats/mp4/hevc.cc', |
+ 'formats/mp4/hevc.h', |
'formats/mp4/mp4_stream_parser.cc', |
'formats/mp4/mp4_stream_parser.h', |
'formats/mp4/sample_to_group_iterator.cc', |
@@ -1252,6 +1260,11 @@ |
'USE_NEON' |
], |
}], |
+ ['proprietary_codecs==1', { |
+ 'sources': [ |
+ 'filters/h265_parser_unittest.cc', |
+ ], |
+ }], |
['media_use_ffmpeg==1', { |
'dependencies': [ |
'../third_party/ffmpeg/ffmpeg.gyp:ffmpeg', |