| OLD | NEW |
| 1 // Copyright (c) 2009 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "media/filters/ffmpeg_common.h" | 5 #include "media/ffmpeg/ffmpeg_common.h" |
| 6 | 6 |
| 7 namespace media { | 7 namespace media { |
| 8 | 8 |
| 9 FFmpegLock::FFmpegLock() { | 9 FFmpegLock::FFmpegLock() { |
| 10 } | 10 } |
| 11 | 11 |
| 12 FFmpegLock::~FFmpegLock() { | 12 FFmpegLock::~FFmpegLock() { |
| 13 } | 13 } |
| 14 | 14 |
| 15 Lock& FFmpegLock::lock() { | 15 Lock& FFmpegLock::lock() { |
| 16 return lock_; | 16 return lock_; |
| 17 } | 17 } |
| 18 | 18 |
| 19 namespace mime_type { | 19 namespace mime_type { |
| 20 | 20 |
| 21 const char kFFmpegAudio[] = "audio/x-ffmpeg"; | 21 const char kFFmpegAudio[] = "audio/x-ffmpeg"; |
| 22 const char kFFmpegVideo[] = "video/x-ffmpeg"; | 22 const char kFFmpegVideo[] = "video/x-ffmpeg"; |
| 23 | 23 |
| 24 } // namespace mime_type | 24 } // namespace mime_type |
| 25 | 25 |
| 26 } // namespace media | 26 } // namespace media |
| OLD | NEW |