mirror of
https://github.com/ElvishArtisan/rivendell.git
synced 2026-01-12 07:35:55 +01:00
2017-02-07 Fred Gleason <fredg@paravelsystems.com>
* Changed the DLL load target for libmad from 'libmad.so' to 'libmad.so.0' in 'cae/cae.cpp' and 'lib/rdaudioconvert.cpp'. * Changed the DLL load target for lame from 'libmp3lame.so' to 'libmp3lame.so.0' in 'cae/cae.cpp' and 'lib/rdaudioconvert.cpp'. * Changed the DLL load target for faad from 'libfaad.so' to 'libfaad.so.2' in 'cae/cae.cpp' and 'lib/rdmp4.cpp'. * Changed the DLL load target for mp4v2 from 'libmp4v2.so' to 'libmp4v2.so.2' in 'cae/cae.cpp' and 'lib/rdaudioconvert.cpp'.
This commit is contained in:
10
cae/cae.cpp
10
cae/cae.cpp
@@ -2060,7 +2060,7 @@ void QApplication::saveState(QSessionManager &sm) {
|
||||
bool MainObject::CheckLame()
|
||||
{
|
||||
#ifdef HAVE_LAME
|
||||
return dlopen("libmp3lame.so",RTLD_LAZY)!=NULL;
|
||||
return dlopen("libmp3lame.so.0",RTLD_LAZY)!=NULL;
|
||||
#else
|
||||
return false;
|
||||
#endif // HAVE_LAME
|
||||
@@ -2070,8 +2070,8 @@ bool MainObject::CheckLame()
|
||||
bool MainObject::CheckMp4Decode()
|
||||
{
|
||||
#ifdef HAVE_MP4_LIBS
|
||||
return (dlopen("libfaad.so",RTLD_LAZY)!=NULL)&&
|
||||
(dlopen("libmp4v2.so",RTLD_LAZY)!=NULL);
|
||||
return (dlopen("libfaad.so.2",RTLD_LAZY)!=NULL)&&
|
||||
(dlopen("libmp4v2.so.2",RTLD_LAZY)!=NULL);
|
||||
#else
|
||||
return false;
|
||||
#endif // HAVE_MP4_LIBS
|
||||
@@ -2081,7 +2081,7 @@ bool MainObject::CheckMp4Decode()
|
||||
bool MainObject::LoadTwoLame()
|
||||
{
|
||||
#ifdef HAVE_TWOLAME
|
||||
if((twolame_handle=dlopen("libtwolame.so",RTLD_NOW))==NULL) {
|
||||
if((twolame_handle=dlopen("libtwolame.so.0",RTLD_NOW))==NULL) {
|
||||
LogLine(RDConfig::LogInfo,
|
||||
"TwoLAME encoder library not found, MPEG L2 encoding not supported");
|
||||
return false;
|
||||
@@ -2168,7 +2168,7 @@ void MainObject::FreeTwoLameEncoder(int card,int stream)
|
||||
bool MainObject::LoadMad()
|
||||
{
|
||||
#ifdef HAVE_MAD
|
||||
if((mad_handle=dlopen("libmad.so",RTLD_NOW))==NULL) {
|
||||
if((mad_handle=dlopen("libmad.so.0",RTLD_NOW))==NULL) {
|
||||
LogLine(RDConfig::LogInfo,
|
||||
"MAD decoder library not found, MPEG L2 decoding not supported");
|
||||
return false;
|
||||
|
||||
Reference in New Issue
Block a user