Attachment #4823 for bug #21741

View | Details | Raw Unified | Return to bug 21741
Collapse All | Expand All

Lines 47-53 bool X264Library::Load() Link Here

(-)a/plugins/video/H.264/gpl/x264loader_unix.cxx (-1 / +1 lines)
47	#ifdef X264_LIB_NAME	47	#ifdef X264_LIB_NAME
48	!Open(X264_LIB_NAME) &&	48	!Open(X264_LIB_NAME) &&
49	#endif	49	#endif
50	!Open("libx264.so")	50	!Open("libx264.so.0")
51	&& !Open("libx264")) {	51	&& !Open("libx264")) {
52	TRACE (1, "H264\tDYNA\tFailed to load x264 library - codec disabled");	52	TRACE (1, "H264\tDYNA\tFailed to load x264 library - codec disabled");
53	return false;	53	return false;




  if (InternalOpen(".", name))
    return true;

  return InternalOpen("/usr/lib", name);
}

bool DynaLink::InternalOpen(const char * dir, const char *name)

    return false;
  }

/*
#ifndef _WIN32
  strcat(path, ".so");
#endif
*/

  // Load the Libary
#ifdef _WIN32


  if (libAvcodec.Open("libavcodec"))
    seperateLibAvutil = false;
  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("libavutil.so.50") || libAvutil.Open("avutil-49")) ) {
    TRACE (1, _codecString << "\tDYNA\tFailed to load FFMPEG libavutil library");
    return false;
  }

Return to bug 21741

Lines 77-83 bool DynaLink::Open(const char *name) Link Here

(-)a/plugins/video/common/dyna.cxx (-3 / +5 lines)
77	if (InternalOpen(".", name))	77	if (InternalOpen(".", name))
78	return true;	78	return true;
79		79
80	return InternalOpen("/usr/local/lib", name);	80	return InternalOpen("/usr/lib", name);
81	}	81	}
82		82
83	bool DynaLink::InternalOpen(const char * dir, const char *name)	83	bool DynaLink::InternalOpen(const char * dir, const char *name)
Lines 98-106 bool DynaLink::InternalOpen(const char * dir, const char *name) Link Here
98	return false;	98	return false;
99	}	99	}
100		100
		101	/*
101	#ifndef _WIN32	102	#ifndef _WIN32
102	strcat(path, ".so");	103	strcat(path, ".so");
103	#endif	104	#endif
		105	*/
104		106
105	// Load the Libary	107	// Load the Libary
106	#ifdef _WIN32	108	#ifdef _WIN32
Lines 215-228 bool FFMPEGLibrary::Load(int ver) Link Here
215		217
216	if (libAvcodec.Open("libavcodec"))	218	if (libAvcodec.Open("libavcodec"))
217	seperateLibAvutil = false;	219	seperateLibAvutil = false;
218	else if (libAvcodec.Open("avcodec-51") \|\| libAvcodec.Open("avcodec-52"))	220	else if (libAvcodec.Open("avcodec-51") \|\| libAvcodec.Open("libavcodec.so.52"))
219	seperateLibAvutil = true;	221	seperateLibAvutil = true;
220	else {	222	else {
221	TRACE (1, _codecString << "\tDYNA\tFailed to load FFMPEG libavcodec library");	223	TRACE (1, _codecString << "\tDYNA\tFailed to load FFMPEG libavcodec library");
222	return false;	224	return false;
223	}	225	}
224		226
225	if (seperateLibAvutil && !(libAvutil.Open("avutil-50") \|\| libAvutil.Open("avutil-49")) ) {	227	if (seperateLibAvutil && !(libAvutil.Open("libavutil.so.50") \|\| libAvutil.Open("avutil-49")) ) {
226	TRACE (1, _codecString << "\tDYNA\tFailed to load FFMPEG libavutil library");	228	TRACE (1, _codecString << "\tDYNA\tFailed to load FFMPEG libavutil library");
227	return false;	229	return false;
228	}	230	}