diff options
| author | Rainer Hochecker <fernetmenta@online.de> | 2014-09-14 19:11:29 +0200 |
|---|---|---|
| committer | Rainer Hochecker <fernetmenta@online.de> | 2014-09-16 13:31:22 +0200 |
| commit | b19254324dbb34537632f5f0409c03846439c177 (patch) | |
| tree | da4f73111fa95e1d24efdede6703c8973a8457d9 | |
| parent | ba2dd331dfb9d39ee515fc460456aeba2c4196a9 (diff) | |
ffmpeg: adapt win32 dlls to major versions of 2.4
| -rw-r--r-- | project/VS2010Express/XBMC.vcxproj | 4 | ||||
| -rw-r--r-- | tools/buildsteps/win32/make-mingwlibs.sh | 2 | ||||
| -rw-r--r-- | xbmc/DllPaths_win32.h | 9 |
3 files changed, 3 insertions, 12 deletions
diff --git a/project/VS2010Express/XBMC.vcxproj b/project/VS2010Express/XBMC.vcxproj index 156b08e8a4..c4126e9d7f 100644 --- a/project/VS2010Express/XBMC.vcxproj +++ b/project/VS2010Express/XBMC.vcxproj @@ -91,7 +91,7 @@ <IgnoreSpecificDefaultLibraries>libcpmt;libc;msvcrt;libcmt;msvcrtd;msvcprtd;%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries> <ModuleDefinitionFile> </ModuleDefinitionFile> - <DelayLoadDLLs>libxslt.dll;dnssd.dll;dwmapi.dll;libmicrohttpd-5.dll;ssh.dll;sqlite3.dll;avcodec-55.dll;avfilter-4.dll;avformat-55.dll;avutil-52.dll;postproc-52.dll;swresample-0.dll;swscale-2.dll;%(DelayLoadDLLs)</DelayLoadDLLs> + <DelayLoadDLLs>libxslt.dll;dnssd.dll;dwmapi.dll;libmicrohttpd-5.dll;ssh.dll;sqlite3.dll;avcodec-56.dll;avfilter-5.dll;avformat-56.dll;avutil-54.dll;postproc-53.dll;swresample-1.dll;swscale-3.dll;%(DelayLoadDLLs)</DelayLoadDLLs> <ProgramDatabaseFile>$(OutDir)$(ProjectName).pdb</ProgramDatabaseFile> <EntryPointSymbol> </EntryPointSymbol> @@ -125,7 +125,7 @@ <IgnoreSpecificDefaultLibraries>libc;msvcrt;libcmt;msvcrtd;msvcprtd;%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries> <ModuleDefinitionFile> </ModuleDefinitionFile> - <DelayLoadDLLs>libxslt.dll;dnssd.dll;dwmapi.dll;libmicrohttpd-5.dll;ssh.dll;sqlite3.dll;avcodec-55.dll;avfilter-4.dll;avformat-55.dll;avutil-52.dll;postproc-52.dll;swresample-0.dll;swscale-2.dll;%(DelayLoadDLLs)</DelayLoadDLLs> + <DelayLoadDLLs>libxslt.dll;dnssd.dll;dwmapi.dll;libmicrohttpd-5.dll;ssh.dll;sqlite3.dll;avcodec-56.dll;avfilter-5.dll;avformat-56.dll;avutil-54.dll;postproc-53.dll;swresample-1.dll;swscale-3.dll;%(DelayLoadDLLs)</DelayLoadDLLs> <ProgramDatabaseFile>$(OutDir)$(ProjectName).pdb</ProgramDatabaseFile> <SubSystem>Console</SubSystem> <EntryPointSymbol> diff --git a/tools/buildsteps/win32/make-mingwlibs.sh b/tools/buildsteps/win32/make-mingwlibs.sh index 9591e476cb..417a69522e 100644 --- a/tools/buildsteps/win32/make-mingwlibs.sh +++ b/tools/buildsteps/win32/make-mingwlibs.sh @@ -83,7 +83,7 @@ echo "##### building ffmpeg dlls #####" cd /xbmc/project/Win32BuildSetup runBackgroundProcess "./buildffmpeg.sh $MAKECLEAN" setfilepath /xbmc/system/players/dvdplayer -checkfiles avcodec-55.dll avformat-55.dll avutil-52.dll postproc-52.dll swscale-2.dll avfilter-4.dll swresample-0.dll +checkfiles avcodec-56.dll avformat-56.dll avutil-54.dll postproc-53.dll swscale-3.dll avfilter-5.dll swresample-1.dll echo "##### building of ffmpeg dlls done #####" echo "##### building libdvd dlls #####" diff --git a/xbmc/DllPaths_win32.h b/xbmc/DllPaths_win32.h index fcc1148f6c..7f379ae5a5 100644 --- a/xbmc/DllPaths_win32.h +++ b/xbmc/DllPaths_win32.h @@ -53,15 +53,6 @@ #define DLL_PATH_LIBDVDNAV "special://xbmcbin/system/players/dvdplayer/libdvdnav.dll" #define DLL_PATH_LIBRTMP "special://xbmcbin/system/players/dvdplayer/librtmp.dll" -/* ffmpeg */ -#define DLL_PATH_LIBAVCODEC "special://xbmcbin/system/players/dvdplayer/avcodec-54.dll" -#define DLL_PATH_LIBAVFORMAT "special://xbmcbin/system/players/dvdplayer/avformat-54.dll" -#define DLL_PATH_LIBAVUTIL "special://xbmcbin/system/players/dvdplayer/avutil-52.dll" -#define DLL_PATH_LIBAVFILTER "special://xbmcbin/system/players/dvdplayer/avfilter-3.dll" -#define DLL_PATH_LIBPOSTPROC "special://xbmcbin/system/players/dvdplayer/postproc-52.dll" -#define DLL_PATH_LIBSWSCALE "special://xbmcbin/system/players/dvdplayer/swscale-2.dll" -#define DLL_PATH_LIBSWRESAMPLE "special://xbmcbin/system/players/dvdplayer/swresample-0.dll" - /* cdrip */ #define DLL_PATH_OGG "special://xbmcbin/system/cdrip/ogg.dll" #define DLL_PATH_VORBIS "special://xbmcbin/system/cdrip/vorbis.dll" |