diff options
| author | scherkus@chromium.org <scherkus@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-11-21 17:53:07 +0000 |
|---|---|---|
| committer | scherkus@chromium.org <scherkus@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-11-21 17:53:07 +0000 |
| commit | 4768b6b9e01a5a88c3e3eb06ae503cf88fc1963c (patch) | |
| tree | 691bb263fbf1060ced489d971b37fe973d242b3b | |
| parent | 6d55bd645e09ed3ae2f7fd1a494e98eb6333d64c (diff) | |
| download | chromium_src-4768b6b9e01a5a88c3e3eb06ae503cf88fc1963c.zip chromium_src-4768b6b9e01a5a88c3e3eb06ae503cf88fc1963c.tar.gz chromium_src-4768b6b9e01a5a88c3e3eb06ae503cf88fc1963c.tar.bz2 | |
Update player_x11 to use media::InitializeMediaLibraryForTesting().
The testing variant uses base::DIR_EXE when loading the library and CHECK()-fails if it can't. In other words, no more setting LD_LIBRARY_PATH.
Review URL: https://codereview.chromium.org/11421027
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@169072 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | media/tools/player_x11/player_x11.cc | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/media/tools/player_x11/player_x11.cc b/media/tools/player_x11/player_x11.cc index 08e6371..d8aa656 100644 --- a/media/tools/player_x11/player_x11.cc +++ b/media/tools/player_x11/player_x11.cc @@ -107,12 +107,6 @@ bool InitPipeline(const scoped_refptr<base::MessageLoopProxy>& message_loop, scoped_refptr<media::Pipeline>* pipeline, MessageLoop* paint_message_loop, media::MessageLoopFactory* message_loop_factory) { - // Load media libraries. - if (!media::InitializeMediaLibrary(FilePath())) { - std::cout << "Unable to initialize the media library." << std::endl; - return false; - } - // Create our filter factories. scoped_ptr<media::FilterCollection> collection( new media::FilterCollection()); @@ -227,6 +221,8 @@ void PeriodicalUpdate( int main(int argc, char** argv) { base::AtExitManager at_exit; + media::InitializeMediaLibraryForTesting(); + CommandLine::Init(argc, argv); CommandLine* command_line = CommandLine::ForCurrentProcess(); std::string filename = command_line->GetSwitchValueASCII("file"); |