| Index: media/media.gyp
|
| diff --git a/media/media.gyp b/media/media.gyp
|
| index de4de9d286865d22146bb5a9455b0f056f9dbead..638f9e8d1d19302e5f9572ad925275c8ac864518 100644
|
| --- a/media/media.gyp
|
| +++ b/media/media.gyp
|
| @@ -451,10 +451,10 @@
|
| 'capture/content/feedback_signal_accumulator.h',
|
| 'capture/content/screen_capture_device_core.cc',
|
| 'capture/content/screen_capture_device_core.h',
|
| - 'capture/content/thread_safe_capture_oracle.cc',
|
| - 'capture/content/thread_safe_capture_oracle.h',
|
| 'capture/content/smooth_event_sampler.cc',
|
| 'capture/content/smooth_event_sampler.h',
|
| + 'capture/content/thread_safe_capture_oracle.cc',
|
| + 'capture/content/thread_safe_capture_oracle.h',
|
| 'capture/content/video_capture_oracle.cc',
|
| 'capture/content/video_capture_oracle.h',
|
| 'capture/video/android/video_capture_device_android.cc',
|
| @@ -511,8 +511,6 @@
|
| 'capture/video/win/video_capture_device_mf_win.h',
|
| 'capture/video/win/video_capture_device_win.cc',
|
| 'capture/video/win/video_capture_device_win.h',
|
| - 'capture/webm_muxer.cc',
|
| - 'capture/webm_muxer.h',
|
| 'cdm/aes_decryptor.cc',
|
| 'cdm/aes_decryptor.h',
|
| 'cdm/cdm_adapter.cc',
|
| @@ -580,10 +578,10 @@
|
| 'filters/h264_bit_reader.h',
|
| 'filters/h264_parser.cc',
|
| 'filters/h264_parser.h',
|
| - 'filters/ivf_parser.cc',
|
| - 'filters/ivf_parser.h',
|
| 'filters/in_memory_url_protocol.cc',
|
| 'filters/in_memory_url_protocol.h',
|
| + 'filters/ivf_parser.cc',
|
| + 'filters/ivf_parser.h',
|
| 'filters/jpeg_parser.cc',
|
| 'filters/jpeg_parser.h',
|
| 'filters/media_source_state.cc',
|
| @@ -640,6 +638,8 @@
|
| 'formats/webm/webm_video_client.cc',
|
| 'formats/webm/webm_video_client.h',
|
| 'formats/webm/webm_webvtt_parser.cc',
|
| + 'muxers/webm_muxer.cc',
|
| + 'muxers/webm_muxer.h',
|
| 'ozone/media_ozone_platform.cc',
|
| 'ozone/media_ozone_platform.h',
|
| 'renderers/audio_renderer_impl.cc',
|
| @@ -1292,7 +1292,6 @@
|
| 'capture/content/video_capture_oracle_unittest.cc',
|
| 'capture/video/fake_video_capture_device_unittest.cc',
|
| 'capture/video/video_capture_device_unittest.cc',
|
| - 'capture/webm_muxer_unittest.cc',
|
| 'cdm/aes_decryptor_unittest.cc',
|
| 'cdm/external_clear_key_test_helper.cc',
|
| 'cdm/external_clear_key_test_helper.h',
|
| @@ -1347,14 +1346,15 @@
|
| 'formats/webm/webm_parser_unittest.cc',
|
| 'formats/webm/webm_tracks_parser_unittest.cc',
|
| 'formats/webm/webm_webvtt_parser_unittest.cc',
|
| + 'muxers/webm_muxer_unittest.cc',
|
| 'renderers/audio_renderer_impl_unittest.cc',
|
| 'renderers/renderer_impl_unittest.cc',
|
| 'renderers/skcanvas_video_renderer_unittest.cc',
|
| 'renderers/video_renderer_impl_unittest.cc',
|
| 'test/pipeline_integration_test.cc',
|
| 'test/pipeline_integration_test_base.cc',
|
| - 'video/h264_poc_unittest.cc',
|
| 'video/gpu_memory_buffer_video_frame_pool_unittest.cc',
|
| + 'video/h264_poc_unittest.cc',
|
| ],
|
| 'include_dirs': [
|
| # Needed by media_drm_bridge.cc.
|
|
|