diff options
| author | ajwong@chromium.org <ajwong@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-10-08 23:17:14 +0000 |
|---|---|---|
| committer | ajwong@chromium.org <ajwong@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-10-08 23:17:14 +0000 |
| commit | 0c3a16b13861c066550c3f582a64e96507040b57 (patch) | |
| tree | 4b534fc6fb54856d3075e6bb6cab8a0aface1e55 /chrome/renderer | |
| parent | 34a78113d3d72c01aa415658e113313fcd48aa03 (diff) | |
| download | chromium_src-0c3a16b13861c066550c3f582a64e96507040b57.zip chromium_src-0c3a16b13861c066550c3f582a64e96507040b57.tar.gz chromium_src-0c3a16b13861c066550c3f582a64e96507040b57.tar.bz2 | |
Move ffmpeg binaries into the Framework package so it can be accssed by Chrome Helper.
BUG=24219
TEST=none
Review URL: http://codereview.chromium.org/269018
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@28478 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/renderer')
| -rw-r--r-- | chrome/renderer/render_process.cc | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/chrome/renderer/render_process.cc b/chrome/renderer/render_process.cc index 6992a67..8dc9264 100644 --- a/chrome/renderer/render_process.cc +++ b/chrome/renderer/render_process.cc @@ -34,6 +34,10 @@ #include "native_client/src/trusted/plugin/nacl_entry_points.h" #include "webkit/glue/webkit_glue.h" +#if defined(OS_MACOSX) +#include "base/mac_util.h" +#endif + //----------------------------------------------------------------------------- RenderProcess::RenderProcess() @@ -91,10 +95,18 @@ RenderProcess::RenderProcess() webkit_glue::SetMediaCacheEnabled(true); } +#if defined(OS_MACOSX) + FilePath bundle_path = mac_util::MainAppBundlePath(); + + initialized_media_library_ = + media::InitializeMediaLibrary(bundle_path.Append("Libraries")); + +#else FilePath module_path; initialized_media_library_ = PathService::Get(base::DIR_MODULE, &module_path) && media::InitializeMediaLibrary(module_path); +#endif } RenderProcess::~RenderProcess() { |