diff options
| author | Minh Ngo <nlminhtl@gmail.com> | 2013-09-04 13:40:49 +0300 |
|---|---|---|
| committer | Minh Ngo <nlminhtl@gmail.com> | 2013-09-04 20:10:22 +0300 |
| commit | 9335f5f1c577b8f6b43200de573f0112f84b007e (patch) | |
| tree | efa436faa01f95e66ee70417339ea788254f4a4b /avmedia/source | |
| parent | 456539a6faa79e4ec7f9f553e215cc2bc501ed62 (diff) | |
Fixing a crash when loading symbols from LibVLC.
Change-Id: Ifb39dea6f0d2328d5658f34ca35d6d65445c38ef
Diffstat (limited to 'avmedia/source')
| -rw-r--r-- | avmedia/source/vlc/vlcmanager.cxx | 4 | ||||
| -rw-r--r-- | avmedia/source/vlc/vlcplayer.hxx | 4 | ||||
| -rw-r--r-- | avmedia/source/vlc/wrapper/SymbolLoader.hxx | 5 |
3 files changed, 8 insertions, 5 deletions
diff --git a/avmedia/source/vlc/vlcmanager.cxx b/avmedia/source/vlc/vlcmanager.cxx index a028d74ebc8a..441dbc1bf1b2 100644 --- a/avmedia/source/vlc/vlcmanager.cxx +++ b/avmedia/source/vlc/vlcmanager.cxx @@ -30,9 +30,11 @@ Manager::Manager( const uno::Reference< lang::XMultiServiceFactory >& rxMgr ) //Check VLC version std::vector<std::string> verComponents; const std::string str(Common::Version()); + + std::cout << str << std::endl; boost::split(verComponents, str, - boost::is_any_of(".-")); + boost::is_any_of(". ")); if (verComponents.size() < 3 || boost::lexical_cast<int>(verComponents[0]) < 2 || (boost::lexical_cast<int>(verComponents[1]) == 0 && boost::lexical_cast<int>(verComponents[2]) < 8)) diff --git a/avmedia/source/vlc/vlcplayer.hxx b/avmedia/source/vlc/vlcplayer.hxx index de809f7faa44..2996cb203d6c 100644 --- a/avmedia/source/vlc/vlcplayer.hxx +++ b/avmedia/source/vlc/vlcplayer.hxx @@ -19,7 +19,9 @@ #ifndef _VLCPLAYER_HXX #define _VLCPLAYER_HXX - +#if defined UNX +#include <unistd.h> +#endif #include "vlccommon.hxx" #include <boost/shared_ptr.hpp> #include <cppuhelper/compbase2.hxx> diff --git a/avmedia/source/vlc/wrapper/SymbolLoader.hxx b/avmedia/source/vlc/wrapper/SymbolLoader.hxx index 3f97fa5964e3..a49e4bf6b6f2 100644 --- a/avmedia/source/vlc/wrapper/SymbolLoader.hxx +++ b/avmedia/source/vlc/wrapper/SymbolLoader.hxx @@ -74,8 +74,8 @@ namespace *pMap[ i ].refValue = NULL; return false; } - - *pMap[ i ].refValue = aMethod; + else + *pMap[ i ].refValue = aMethod; } return true; @@ -104,7 +104,6 @@ namespace VLC if (tryLink( aModule, pMap )) { - osl_unloadModule( aModule ); return true; } |