| OLD | NEW |
|---|
| 1 // Copyright (c) 2010 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/ffmpeg/ffmpeg_common.h" | 5 #include "media/ffmpeg/ffmpeg_common.h" |
| 6 | 6 |
| 7 namespace media { | 7 namespace media { |
| 8 | 8 |
| 9 FFmpegLock::FFmpegLock() { | |
| 10 } | |
| 11 | |
| 12 FFmpegLock::~FFmpegLock() { | |
| 13 } | |
| 14 | |
| 15 Lock& FFmpegLock::lock() { | |
| 16 return lock_; | |
| 17 } | |
| 18 | |
| 19 namespace mime_type { | 9 namespace mime_type { |
| 20 | 10 |
| 21 const char kFFmpegAudio[] = "audio/x-ffmpeg"; | 11 const char kFFmpegAudio[] = "audio/x-ffmpeg"; |
| 22 const char kFFmpegVideo[] = "video/x-ffmpeg"; | 12 const char kFFmpegVideo[] = "video/x-ffmpeg"; |
| 23 | 13 |
| 24 } // namespace mime_type | 14 } // namespace mime_type |
| 25 | 15 |
| 26 } // namespace media | 16 } // namespace media |
| OLD | NEW |
|---|
Chromium Code Reviews
Issue 1213002:
Removed custom FFmpegLock. Removed ffmpeg headers from third_party/ffmpeg/include. (Closed)
