summaryrefslogtreecommitdiffstats
path: root/media/media.gyp
diff options
context:
space:
mode:
authorscherkus@chromium.org <scherkus@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-03-12 00:03:46 +0000
committerscherkus@chromium.org <scherkus@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-03-12 00:03:46 +0000
commit67922822899b341d9788c59ceb32d8e12ea2c5e8 (patch)
tree259faf47fea0eccc547c6c4394c5632725d3e9e4 /media/media.gyp
parent7b6afd0c466f6a8e87178008c65afc00fd84440e (diff)
downloadchromium_src-67922822899b341d9788c59ceb32d8e12ea2c5e8.zip
chromium_src-67922822899b341d9788c59ceb32d8e12ea2c5e8.tar.gz
chromium_src-67922822899b341d9788c59ceb32d8e12ea2c5e8.tar.bz2
Fold media/ffmpeg/ffmpeg_util.{cc,h} into media/ffmpeg/ffmpeg_common.{cc,h}
BUG=none TEST=compiles Review URL: http://codereview.chromium.org/6686011 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@77896 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'media/media.gyp')
-rw-r--r--media/media.gyp2
1 files changed, 0 insertions, 2 deletions
diff --git a/media/media.gyp b/media/media.gyp
index 48d9e4d..ebccbf2 100644
--- a/media/media.gyp
+++ b/media/media.gyp
@@ -115,8 +115,6 @@
'base/video_frame.h',
'ffmpeg/ffmpeg_common.cc',
'ffmpeg/ffmpeg_common.h',
- 'ffmpeg/ffmpeg_util.cc',
- 'ffmpeg/ffmpeg_util.h',
'ffmpeg/file_protocol.cc',
'ffmpeg/file_protocol.h',
'filters/audio_file_reader.cc',