| OLD | NEW |
|---|
| 1 // Copyright (c) 2009 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2009 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/base/mock_ffmpeg.h" | 5 #include "media/base/mock_ffmpeg.h" |
| 6 | 6 |
| 7 #include "base/logging.h" | 7 #include "base/logging.h" |
| 8 #include "media/filters/ffmpeg_common.h" | 8 #include "media/ffmpeg/ffmpeg_common.h" |
| 9 | 9 |
| 10 using ::testing::_; | 10 using ::testing::_; |
| 11 using ::testing::AtMost; | 11 using ::testing::AtMost; |
| 12 using ::testing::DoAll; | 12 using ::testing::DoAll; |
| 13 using ::testing::Return; | 13 using ::testing::Return; |
| 14 using ::testing::SaveArg; | 14 using ::testing::SaveArg; |
| 15 | 15 |
| 16 namespace media { | 16 namespace media { |
| 17 | 17 |
| 18 MockFFmpeg* MockFFmpeg::instance_ = NULL; | 18 MockFFmpeg* MockFFmpeg::instance_ = NULL; |
| (...skipping 186 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 205 media::MockFFmpeg::get()->AVLogSetLevel(level); | 205 media::MockFFmpeg::get()->AVLogSetLevel(level); |
| 206 } | 206 } |
| 207 | 207 |
| 208 void av_destruct_packet(AVPacket *pkt) { | 208 void av_destruct_packet(AVPacket *pkt) { |
| 209 media::MockFFmpeg::get()->AVDestructPacket(pkt); | 209 media::MockFFmpeg::get()->AVDestructPacket(pkt); |
| 210 } | 210 } |
| 211 | 211 |
| 212 } // extern "C" | 212 } // extern "C" |
| 213 | 213 |
| 214 } // namespace media | 214 } // namespace media |
| OLD | NEW |
|---|
Chromium Code Reviews
Issue 555087:
Refactor some code that depends on FFmpeg (Closed)
