Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

changed: restore ffmpeg's normal naming of swscale-0.dll

  • Loading branch information...
commit 52a47b429673a3002ba777731ed9bcef67680791 1 parent 275c12a
@elupus elupus authored
View
2  .gitignore
@@ -379,7 +379,7 @@ project/Win32BuildSetup/dependencies/libcdio-10.dll
/system/players/dvdplayer/libfontconfig-1.dll
/system/players/dvdplayer/librtmp.dll
/system/players/dvdplayer/postproc-51.dll
-/system/players/dvdplayer/swscale-0.6.1.dll
+/system/players/dvdplayer/swscale-0.dll
/system/players/dvdplayer/libbluray.dll
/system/players/dvdplayer/libmpeg2-0.dll
/system/players/dvdplayer/libmad.dll
View
3  lib/ffmpeg/build_xbmc_win32.sh
@@ -42,10 +42,9 @@ OPTIONS="
make &&
cp lib*/*.dll .libs/ &&
-mv .libs/swscale-0.dll .libs/swscale-0.6.1.dll &&
cp .libs/avcodec-52.dll /xbmc/system/players/dvdplayer/ &&
cp .libs/avcore-0.dll /xbmc/system/players/dvdplayer/ &&
cp .libs/avformat-52.dll /xbmc/system/players/dvdplayer/ &&
cp .libs/avutil-50.dll /xbmc/system/players/dvdplayer/ &&
cp .libs/postproc-51.dll /xbmc/system/players/dvdplayer/ &&
-cp .libs/swscale-0.6.1.dll /xbmc/system/players/dvdplayer/
+cp .libs/swscale-0.dll /xbmc/system/players/dvdplayer/
View
2  project/Win32BuildSetup/buildmingwlibs.sh
@@ -59,7 +59,7 @@ echo "##### building ffmpeg dlls #####"
cd /xbmc/lib/ffmpeg/
sh ./build_xbmc_win32.sh $MAKECLEAN
setfilepath /xbmc/system/players/dvdplayer
-checkfiles avcodec-52.dll avcore-0.dll avformat-52.dll avutil-50.dll postproc-51.dll swscale-0.6.1.dll
+checkfiles avcodec-52.dll avcore-0.dll avformat-52.dll avutil-50.dll postproc-51.dll swscale-0.dll
echo "##### building of ffmpeg dlls done #####"
echo "##### building libdvd dlls #####"
View
2  xbmc/DllPaths_win32.h
@@ -64,7 +64,7 @@
#define DLL_PATH_LIBAVFORMAT "special://xbmcbin/system/players/dvdplayer/avformat-52.dll"
#define DLL_PATH_LIBAVUTIL "special://xbmcbin/system/players/dvdplayer/avutil-50.dll"
#define DLL_PATH_LIBPOSTPROC "special://xbmcbin/system/players/dvdplayer/postproc-51.dll"
-#define DLL_PATH_LIBSWSCALE "special://xbmcbin/system/players/dvdplayer/swscale-0.6.1.dll"
+#define DLL_PATH_LIBSWSCALE "special://xbmcbin/system/players/dvdplayer/swscale-0.dll"
/* cdrip */
#define DLL_PATH_LAME_ENC "special://xbmcbin/system/cdrip/lame_enc.dll"
Please sign in to comment.
Something went wrong with that request. Please try again.