diff options
| author | hclam@chromium.org <hclam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-01-26 01:49:32 +0000 |
|---|---|---|
| committer | hclam@chromium.org <hclam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-01-26 01:49:32 +0000 |
| commit | a651b74d09d8f96d6dbb488dde3c494d97544886 (patch) | |
| tree | 30c6280d152e13b42e38d1ceed96759ce65db15b /media/base | |
| parent | 673590a92d94c9fac62a3984f31e89461bde5054 (diff) | |
| download | chromium_src-a651b74d09d8f96d6dbb488dde3c494d97544886.zip chromium_src-a651b74d09d8f96d6dbb488dde3c494d97544886.tar.gz chromium_src-a651b74d09d8f96d6dbb488dde3c494d97544886.tar.bz2 | |
Refactor some code that depends on FFmpeg
Some FFmpeg header and source files are misplaced:
media/filters/ffmpeg_common.{cc, h} -> media/ffmpeg
media/tools/media_bench/file_protocol.{cc, h} -> media/ffmpeg
And the necessary refactoring for the new location is done.
Review URL: http://codereview.chromium.org/555087
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@37080 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'media/base')
| -rw-r--r-- | media/base/mock_ffmpeg.cc | 2 | ||||
| -rw-r--r-- | media/base/mock_ffmpeg.h | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/media/base/mock_ffmpeg.cc b/media/base/mock_ffmpeg.cc index 2422dd9..0d872068 100644 --- a/media/base/mock_ffmpeg.cc +++ b/media/base/mock_ffmpeg.cc @@ -5,7 +5,7 @@ #include "media/base/mock_ffmpeg.h" #include "base/logging.h" -#include "media/filters/ffmpeg_common.h" +#include "media/ffmpeg/ffmpeg_common.h" using ::testing::_; using ::testing::AtMost; diff --git a/media/base/mock_ffmpeg.h b/media/base/mock_ffmpeg.h index 99c9c086..a4a9f1a 100644 --- a/media/base/mock_ffmpeg.h +++ b/media/base/mock_ffmpeg.h @@ -1,4 +1,4 @@ -// Copyright (c) 2009 The Chromium Authors. All rights reserved. +// Copyright (c) 2010 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. @@ -6,7 +6,7 @@ #define MEDIA_BASE_MOCK_FFMPEG_H_ // TODO(scherkus): See if we can remove ffmpeg_common from this file. -#include "media/filters/ffmpeg_common.h" +#include "media/ffmpeg/ffmpeg_common.h" #include "testing/gmock/include/gmock/gmock.h" namespace media { |