Index: media/media.gyp |
diff --git a/media/media.gyp b/media/media.gyp |
index 312f4267a1d6c76ae1cf79f9f001e2cbc200b7b9..bf5f80ccad2515fb885445f00e69f439cdaca970 100644 |
--- a/media/media.gyp |
+++ b/media/media.gyp |
@@ -644,6 +644,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', |
ddorwin
2015/06/12 00:52:27
Should we block these on a separate hevc variable
servolk
2015/06/12 21:57:31
We had a separate lengthy discussion with rsleevi@
ddorwin
2015/06/19 21:40:14
They didn't want *global* GYP flags. What I'm prop
|
+ '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', |
@@ -985,8 +987,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', |
@@ -1025,6 +1031,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', |
@@ -1232,6 +1240,11 @@ |
'USE_NEON' |
], |
}], |
+ ['proprietary_codecs==1', { |
+ 'sources': [ |
+ 'filters/h265_parser_unittest.cc', |
+ ], |
+ }], |
['media_use_ffmpeg==1', { |
'dependencies': [ |
'../third_party/ffmpeg/ffmpeg.gyp:ffmpeg', |