From 67922822899b341d9788c59ceb32d8e12ea2c5e8 Mon Sep 17 00:00:00 2001
From: "scherkus@chromium.org"
 <scherkus@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>
Date: Sat, 12 Mar 2011 00:03:46 +0000
Subject: 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
---
 media/media.gyp | 2 --
 1 file changed, 2 deletions(-)

(limited to 'media/media.gyp')

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',
-- 
cgit v1.1