diff --git a/plugins/video/H.264/gpl/x264loader_unix.cxx b/plugins/video/H.264/gpl/x264loader_unix.cxx index fcbbc41..5c89a0a 100644 --- a/plugins/video/H.264/gpl/x264loader_unix.cxx +++ b/plugins/video/H.264/gpl/x264loader_unix.cxx @@ -47,7 +47,7 @@ bool X264Library::Load() #ifdef X264_LIB_NAME !Open(X264_LIB_NAME) && #endif - !Open("libx264.so") + !Open("libx264.so.0") && !Open("libx264")) { TRACE (1, "H264\tDYNA\tFailed to load x264 library - codec disabled"); return false; diff --git a/plugins/video/common/dyna.cxx b/plugins/video/common/dyna.cxx index e1811e2..b21eea3 100644 --- a/plugins/video/common/dyna.cxx +++ b/plugins/video/common/dyna.cxx @@ -77,7 +77,7 @@ bool DynaLink::Open(const char *name) if (InternalOpen(".", name)) return true; - return InternalOpen("/usr/local/lib", name); + return InternalOpen("/usr/lib", name); } bool DynaLink::InternalOpen(const char * dir, const char *name) @@ -98,9 +98,11 @@ bool DynaLink::InternalOpen(const char * dir, const char *name) return false; } +/* #ifndef _WIN32 strcat(path, ".so"); #endif +*/ // Load the Libary #ifdef _WIN32 @@ -215,14 +217,14 @@ bool FFMPEGLibrary::Load(int ver) if (libAvcodec.Open("libavcodec")) seperateLibAvutil = false; - else if (libAvcodec.Open("avcodec-51") || libAvcodec.Open("avcodec-52")) + else if (libAvcodec.Open("avcodec-51") || libAvcodec.Open("libavcodec.so.52")) seperateLibAvutil = true; else { TRACE (1, _codecString << "\tDYNA\tFailed to load FFMPEG libavcodec library"); return false; } - if (seperateLibAvutil && !(libAvutil.Open("avutil-50") || libAvutil.Open("avutil-49")) ) { + if (seperateLibAvutil && !(libAvutil.Open("libavutil.so.50") || libAvutil.Open("avutil-49")) ) { TRACE (1, _codecString << "\tDYNA\tFailed to load FFMPEG libavutil library"); return false; }