| Index: media/media.gyp
|
| ===================================================================
|
| --- media/media.gyp (revision 22793)
|
| +++ media/media.gyp (working copy)
|
| @@ -51,6 +51,9 @@
|
| 'base/buffer_queue.h',
|
| 'base/buffer_queue.cc',
|
| 'base/buffers.h',
|
| + 'base/clock.h',
|
| + 'base/clock_impl.cc',
|
| + 'base/clock_impl.h',
|
| 'base/data_buffer.cc',
|
| 'base/data_buffer.h',
|
| 'base/factory.h',
|
| @@ -154,6 +157,7 @@
|
| 'audio/simple_sources_unittest.cc',
|
| 'audio/win/audio_output_win_unittest.cc',
|
| 'base/buffer_queue_unittest.cc',
|
| + 'base/clock_impl_unittest.cc',
|
| 'base/data_buffer_unittest.cc',
|
| 'base/mock_ffmpeg.cc',
|
| 'base/mock_ffmpeg.h',
|
|
|
| Property changes on: media\media.gyp
|
| ___________________________________________________________________
|
| Modified: svn:mergeinfo
|
| Merged /trunk/src/media/media.gyp:r21882
|
|
|
|
|