diff options
| author | scherkus@chromium.org <scherkus@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-03-12 00:03:46 +0000 |
|---|---|---|
| committer | scherkus@chromium.org <scherkus@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-03-12 00:03:46 +0000 |
| commit | 67922822899b341d9788c59ceb32d8e12ea2c5e8 (patch) | |
| tree | 259faf47fea0eccc547c6c4394c5632725d3e9e4 /media/video | |
| parent | 7b6afd0c466f6a8e87178008c65afc00fd84440e (diff) | |
| download | chromium_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/video')
| -rw-r--r-- | media/video/ffmpeg_video_allocator.h | 3 | ||||
| -rw-r--r-- | media/video/ffmpeg_video_decode_engine.cc | 1 |
2 files changed, 1 insertions, 3 deletions
diff --git a/media/video/ffmpeg_video_allocator.h b/media/video/ffmpeg_video_allocator.h index c1e371a..5602256 100644 --- a/media/video/ffmpeg_video_allocator.h +++ b/media/video/ffmpeg_video_allocator.h @@ -1,4 +1,4 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -9,7 +9,6 @@ #include "base/scoped_ptr.h" #include "media/base/video_frame.h" #include "media/ffmpeg/ffmpeg_common.h" -#include "media/ffmpeg/ffmpeg_util.h" #include <deque> #include <map> diff --git a/media/video/ffmpeg_video_decode_engine.cc b/media/video/ffmpeg_video_decode_engine.cc index 20fc480..18397e5 100644 --- a/media/video/ffmpeg_video_decode_engine.cc +++ b/media/video/ffmpeg_video_decode_engine.cc @@ -13,7 +13,6 @@ #include "media/base/media_switches.h" #include "media/base/pipeline.h" #include "media/ffmpeg/ffmpeg_common.h" -#include "media/ffmpeg/ffmpeg_util.h" #include "media/filters/ffmpeg_demuxer.h" #include "media/video/ffmpeg_video_allocator.h" |