diff options
| author | scherkus@chromium.org <scherkus@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-03-23 22:34:24 +0000 |
|---|---|---|
| committer | scherkus@chromium.org <scherkus@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-03-23 22:34:24 +0000 |
| commit | 34f993563386ad569f3674d157153e697e847e0a (patch) | |
| tree | bb12aa46242ad8534f51387cca789375ba92f10f /media/media.gyp | |
| parent | 5ff5ee97910c9fb6909f4a3029427edd21366d9b (diff) | |
| download | chromium_src-34f993563386ad569f3674d157153e697e847e0a.zip chromium_src-34f993563386ad569f3674d157153e697e847e0a.tar.gz chromium_src-34f993563386ad569f3674d157153e697e847e0a.tar.bz2 | |
Merged VideoSurface, VideoFrame and VideoFrameImpl in VideoFrame.
Patch by sergeyu@chromium.org
BUG=28100
TEST=Ran media_unittests
Review URL: http://codereview.chromium.org/1226001
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@42391 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'media/media.gyp')
| -rw-r--r-- | media/media.gyp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/media/media.gyp b/media/media.gyp index 20e1f87..08c2f2b 100644 --- a/media/media.gyp +++ b/media/media.gyp @@ -72,8 +72,8 @@ 'base/seekable_buffer.h', 'base/synchronizer.cc', 'base/synchronizer.h', - 'base/video_frame_impl.cc', - 'base/video_frame_impl.h', + 'base/video_frame.cc', + 'base/video_frame.h', 'base/yuv_convert.cc', 'base/yuv_convert.h', 'base/yuv_row_win.cc', @@ -185,7 +185,7 @@ 'base/pts_heap_unittest.cc', 'base/run_all_unittests.cc', 'base/seekable_buffer_unittest.cc', - 'base/video_frame_impl_unittest.cc', + 'base/video_frame_unittest.cc', 'base/yuv_convert_unittest.cc', 'filters/audio_renderer_algorithm_ola_unittest.cc', 'filters/audio_renderer_base_unittest.cc', |