diff options
| author | scherkus@chromium.org <scherkus@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-03-12 02:57:38 +0000 |
|---|---|---|
| committer | scherkus@chromium.org <scherkus@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-03-12 02:57:38 +0000 |
| commit | 3cb29296dd9eb603f033a527e33f5e40eea90c9d (patch) | |
| tree | 4a7967c1f9ff805fe8c3dbc4c824956b64d6048d /media/ffmpeg/ffmpeg_common.cc | |
| parent | 057d959ad8fa954e5ead634ff1d29e4d75f28678 (diff) | |
| download | chromium_src-3cb29296dd9eb603f033a527e33f5e40eea90c9d.zip chromium_src-3cb29296dd9eb603f033a527e33f5e40eea90c9d.tar.gz chromium_src-3cb29296dd9eb603f033a527e33f5e40eea90c9d.tar.bz2 | |
Removed custom FFmpegLock. Removed ffmpeg headers from third_party/ffmpeg/include.
Patch by sergeyu@chromium.org
BUG=23271
TEST=none
Review URL: http://codereview.chromium.org/909002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@41386 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'media/ffmpeg/ffmpeg_common.cc')
| -rw-r--r-- | media/ffmpeg/ffmpeg_common.cc | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/media/ffmpeg/ffmpeg_common.cc b/media/ffmpeg/ffmpeg_common.cc index 5100b31..08228fd 100644 --- a/media/ffmpeg/ffmpeg_common.cc +++ b/media/ffmpeg/ffmpeg_common.cc @@ -6,16 +6,6 @@ namespace media { -FFmpegLock::FFmpegLock() { -} - -FFmpegLock::~FFmpegLock() { -} - -Lock& FFmpegLock::lock() { - return lock_; -} - namespace mime_type { const char kFFmpegAudio[] = "audio/x-ffmpeg"; |