diff -uwB fuppes-0.660/src/lib/Transcoding/FaadWrapper.cpp fuppes-working/src/lib/Transcoding/FaadWrapper.cpp --- fuppes-0.660/src/lib/Transcoding/FaadWrapper.cpp 2009-11-19 09:16:25.000000000 +0000 +++ fuppes-working/src/lib/Transcoding/FaadWrapper.cpp 2010-02-07 21:39:14.000000000 +0000 @@ -350,52 +350,52 @@ return false; } - m_faacDecOpen = (faacDecOpen_t)FuppesGetProcAddress(m_LibHandle, "faacDecOpen"); + m_faacDecOpen = (faacDecOpen_t)FuppesGetProcAddress(m_LibHandle, "NeAACDecOpen"); if(!m_faacDecOpen) { CSharedLog::Shared()->Log(L_EXT, "cannot load symbol 'faacDecOpen'", __FILE__, __LINE__); return false; } - m_faacDecGetErrorMessage = (faacDecGetErrorMessage_t)FuppesGetProcAddress(m_LibHandle, "faacDecGetErrorMessage"); + m_faacDecGetErrorMessage = (faacDecGetErrorMessage_t)FuppesGetProcAddress(m_LibHandle, "NeAACDecGetErrorMessage"); if(!m_faacDecGetErrorMessage) { CSharedLog::Shared()->Log(L_EXT, "cannot load symbol 'faacDecGetErrorMessage'", __FILE__, __LINE__); return false; } - m_faacDecGetCurrentConfiguration = (faacDecGetCurrentConfiguration_t)FuppesGetProcAddress(m_LibHandle, "faacDecGetCurrentConfiguration"); + m_faacDecGetCurrentConfiguration = (faacDecGetCurrentConfiguration_t)FuppesGetProcAddress(m_LibHandle, "NeAACDecGetCurrentConfiguration"); if(!m_faacDecGetCurrentConfiguration) { CSharedLog::Shared()->Log(L_EXT, "cannot load symbol 'faacDecGetCurrentConfiguration'", __FILE__, __LINE__); } - m_faacDecSetConfiguration = (faacDecSetConfiguration_t)FuppesGetProcAddress(m_LibHandle, "faacDecSetConfiguration"); + m_faacDecSetConfiguration = (faacDecSetConfiguration_t)FuppesGetProcAddress(m_LibHandle, "NeAACDecSetConfiguration"); if(!m_faacDecSetConfiguration) { CSharedLog::Shared()->Log(L_EXT, "cannot load symbol 'faacDecSetConfiguration'", __FILE__, __LINE__); } - m_faacDecInit = (faacDecInit_t)FuppesGetProcAddress(m_LibHandle, "faacDecInit"); + m_faacDecInit = (faacDecInit_t)FuppesGetProcAddress(m_LibHandle, "NeAACDecInit"); if(!m_faacDecInit) { CSharedLog::Shared()->Log(L_EXT, "cannot load symbol 'faacDecInit'", __FILE__, __LINE__); } - m_faacDecInit2 = (faacDecInit2_t)FuppesGetProcAddress(m_LibHandle, "faacDecInit2"); + m_faacDecInit2 = (faacDecInit2_t)FuppesGetProcAddress(m_LibHandle, "NeAACDecInit2"); if(!m_faacDecInit2) { CSharedLog::Shared()->Log(L_EXT, "cannot load symbol 'faacDecInit2'", __FILE__, __LINE__); return false; } - m_faacDecDecode = (faacDecDecode_t)FuppesGetProcAddress(m_LibHandle, "faacDecDecode"); + m_faacDecDecode = (faacDecDecode_t)FuppesGetProcAddress(m_LibHandle, "NeAACDecDecode"); if(!m_faacDecDecode) { CSharedLog::Shared()->Log(L_EXT, "cannot load symbol 'faacDecDecode'", __FILE__, __LINE__); return false; } - m_faacDecClose = (faacDecClose_t)FuppesGetProcAddress(m_LibHandle, "faacDecClose"); + m_faacDecClose = (faacDecClose_t)FuppesGetProcAddress(m_LibHandle, "NeAACDecClose"); if(!m_faacDecClose) { CSharedLog::Shared()->Log(L_EXT, "cannot load symbol 'faacDecClose'", __FILE__, __LINE__); return false; } - m_AudioSpecificConfig = (AudioSpecificConfig_t)FuppesGetProcAddress(m_LibHandle, "AudioSpecificConfig"); + m_AudioSpecificConfig = (AudioSpecificConfig_t)FuppesGetProcAddress(m_LibHandle, "NeAACDecAudioSpecificConfig"); if(!m_AudioSpecificConfig) { m_AudioSpecificConfig = (AudioSpecificConfig_t)FuppesGetProcAddress(m_LibHandle, "faacDecAudioSpecificConfig"); if(!m_AudioSpecificConfig) { @@ -407,6 +407,8 @@ #ifdef HAVE_MP4FF_H + #ifdef DYNAMIC_MP4FF_H + #ifdef WIN32 sLibName = "libmp4ff-0.dll"; #else @@ -473,6 +475,57 @@ CSharedLog::Shared()->Log(L_EXT, "cannot load symbol 'mp4ff_get_sample_duration'", __FILE__, __LINE__); return false; } + #else /* DYNAMIC_MP4FF_H */ + + m_mp4ff_read_sample = (mp4ff_read_sample_t)mp4ff_read_sample; + if(!m_mp4ff_read_sample) { + CSharedLog::Shared()->Log(L_EXT, "cannot load symbol 'mp4ff_read_sample'", __FILE__, __LINE__); + return false; + } + + m_mp4ff_time_scale = (mp4ff_time_scale_t)mp4ff_time_scale; + if(!m_mp4ff_time_scale) { + CSharedLog::Shared()->Log(L_EXT, "cannot load symbol 'mp4ff_time_scale'", __FILE__, __LINE__); + return false; + } + + m_mp4ff_num_samples = (mp4ff_num_samples_t)mp4ff_num_samples; + if(!m_mp4ff_num_samples) { + CSharedLog::Shared()->Log(L_EXT, "cannot load symbol 'mp4ff_num_samples'", __FILE__, __LINE__); + return false; + } + + m_mp4ff_open_read = (mp4ff_open_read_t)mp4ff_open_read; + if(!m_mp4ff_open_read) { + CSharedLog::Shared()->Log(L_EXT, "cannot load symbol 'mp4ff_open_read'", __FILE__, __LINE__); + return false; + } + + m_mp4ff_close = (mp4ff_close_t)mp4ff_close; + if(!m_mp4ff_close) { + CSharedLog::Shared()->Log(L_EXT, "cannot load symbol 'mp4ff_close'", __FILE__, __LINE__); + return false; + } + + m_mp4ff_get_decoder_config = (mp4ff_get_decoder_config_t)mp4ff_get_decoder_config; + if(!m_mp4ff_get_decoder_config) { + CSharedLog::Shared()->Log(L_EXT, "cannot load symbol 'mp4ff_get_decoder_config'", __FILE__, __LINE__); + return false; + } + + m_mp4ff_total_tracks = (mp4ff_total_tracks_t)mp4ff_total_tracks; + if(!m_mp4ff_total_tracks) { + CSharedLog::Shared()->Log(L_EXT, "cannot load symbol 'mp4ff_total_tracks'", __FILE__, __LINE__); + return false; + } + + m_mp4ff_get_sample_duration = (mp4ff_get_sample_duration_t)mp4ff_get_sample_duration; + if(!m_mp4ff_get_sample_duration) { + CSharedLog::Shared()->Log(L_EXT, "cannot load symbol 'mp4ff_get_sample_duration'", __FILE__, __LINE__); + return false; + } + + #endif /* DYNAMIC_MP4FF_H */ #endif // HAVE_MP4FF_H