summaryrefslogtreecommitdiffstats
path: root/chrome/renderer
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 /chrome/renderer
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 'chrome/renderer')
-rw-r--r--chrome/renderer/media/ipc_video_decoder.cc1
1 files changed, 0 insertions, 1 deletions
diff --git a/chrome/renderer/media/ipc_video_decoder.cc b/chrome/renderer/media/ipc_video_decoder.cc
index 9593cfb..361642b 100644
--- a/chrome/renderer/media/ipc_video_decoder.cc
+++ b/chrome/renderer/media/ipc_video_decoder.cc
@@ -14,7 +14,6 @@
#include "media/base/media_format.h"
#include "media/base/video_frame.h"
#include "media/ffmpeg/ffmpeg_common.h"
-#include "media/ffmpeg/ffmpeg_util.h"
#include "media/filters/ffmpeg_interfaces.h"
#include "media/video/video_decode_engine.h"