| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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/media.h" | 5 #include "media/base/media.h" |
| 6 | 6 |
| 7 #include <string> | 7 #include <string> |
| 8 | 8 |
| 9 #include "base/files/file_path.h" | 9 #include "base/files/file_path.h" |
| 10 #include "base/logging.h" | 10 #include "base/logging.h" |
| 11 #include "base/path_service.h" | |
| 12 #include "base/strings/stringize_macros.h" | 11 #include "base/strings/stringize_macros.h" |
| 13 #include "media/ffmpeg/ffmpeg_common.h" | 12 #include "media/ffmpeg/ffmpeg_common.h" |
| 14 #include "third_party/ffmpeg/ffmpeg_stubs.h" | 13 #include "third_party/ffmpeg/ffmpeg_stubs.h" |
| 15 | 14 |
| 16 using third_party_ffmpeg::kNumStubModules; | 15 using third_party_ffmpeg::kNumStubModules; |
| 17 using third_party_ffmpeg::kModuleFfmpegsumo; | 16 using third_party_ffmpeg::kModuleFfmpegsumo; |
| 18 using third_party_ffmpeg::InitializeStubs; | 17 using third_party_ffmpeg::InitializeStubs; |
| 19 using third_party_ffmpeg::StubPathMap; | 18 using third_party_ffmpeg::StubPathMap; |
| 20 | 19 |
| 21 namespace media { | 20 namespace media { |
| (...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 58 paths[kModuleFfmpegsumo].push_back(module_dir.Append( | 57 paths[kModuleFfmpegsumo].push_back(module_dir.Append( |
| 59 FILE_PATH_LITERAL(DSO_NAME("avcodec", AVCODEC_VERSION))).value()); | 58 FILE_PATH_LITERAL(DSO_NAME("avcodec", AVCODEC_VERSION))).value()); |
| 60 paths[kModuleFfmpegsumo].push_back(module_dir.Append( | 59 paths[kModuleFfmpegsumo].push_back(module_dir.Append( |
| 61 FILE_PATH_LITERAL(DSO_NAME("avformat", AVFORMAT_VERSION))).value()); | 60 FILE_PATH_LITERAL(DSO_NAME("avformat", AVFORMAT_VERSION))).value()); |
| 62 | 61 |
| 63 return InitializeStubs(paths); | 62 return InitializeStubs(paths); |
| 64 } | 63 } |
| 65 | 64 |
| 66 } // namespace internal | 65 } // namespace internal |
| 67 } // namespace media | 66 } // namespace media |
| OLD | NEW |