Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[ffmpeg] fix shared library versions (closes #14274) #2621

Merged
merged 1 commit into from
Apr 18, 2013
Merged

[ffmpeg] fix shared library versions (closes #14274) #2621

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions lib/Makefile.in
View file
Open in desktop
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -12,10 +12,10 @@ else
AVPREFIX= AVPREFIX=
endif endif


AVFORMAT_SO=$(AVPREFIX)avformat-53-$(ARCH).so AVFORMAT_SO=$(AVPREFIX)avformat-54-$(ARCH).so
AVCODEC_SO=$(AVPREFIX)avcodec-53-$(ARCH).so AVCODEC_SO=$(AVPREFIX)avcodec-54-$(ARCH).so
AVUTIL_SO=$(AVPREFIX)avutil-51-$(ARCH).so AVUTIL_SO=$(AVPREFIX)avutil-52-$(ARCH).so
AVFILTER_SO=$(AVPREFIX)avfilter-2-$(ARCH).so AVFILTER_SO=$(AVPREFIX)avfilter-3-$(ARCH).so
SWSCALE_SO=$(AVPREFIX)swscale-2-$(ARCH).so SWSCALE_SO=$(AVPREFIX)swscale-2-$(ARCH).so
POSTPROC_SO=$(AVPREFIX)postproc-52-$(ARCH).so POSTPROC_SO=$(AVPREFIX)postproc-52-$(ARCH).so
SWRESAMPLE_SO=$(AVPREFIX)swresample-0-$(ARCH).so SWRESAMPLE_SO=$(AVPREFIX)swresample-0-$(ARCH).so
Expand Down
2 changes: 1 addition & 1 deletion tools/buildsteps/win32/make-mingwlibs.sh
View file
Open in desktop
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ echo "##### building ffmpeg dlls #####"
cd /xbmc/lib/ffmpeg/ cd /xbmc/lib/ffmpeg/
sh ./build_xbmc_win32.sh $MAKECLEAN sh ./build_xbmc_win32.sh $MAKECLEAN
setfilepath /xbmc/system/players/dvdplayer setfilepath /xbmc/system/players/dvdplayer
checkfiles avcodec-53.dll avformat-53.dll avutil-51.dll postproc-52.dll swscale-2.dll avfilter-2.dll swresample-0.dll checkfiles avcodec-54.dll avformat-54.dll avutil-52.dll postproc-52.dll swscale-2.dll avfilter-3.dll swresample-0.dll
echo "##### building of ffmpeg dlls done #####" echo "##### building of ffmpeg dlls done #####"


echo "##### building libdvd dlls #####" echo "##### building libdvd dlls #####"
Expand Down
8 changes: 4 additions & 4 deletions xbmc/DllPaths_generated.h.in
View file
Open in desktop
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -72,12 +72,12 @@
#define DLL_PATH_LIBMAD "@MAD_SONAME@" #define DLL_PATH_LIBMAD "@MAD_SONAME@"


/* ffmpeg */ /* ffmpeg */
#define DLL_PATH_LIBAVCODEC "special://xbmcbin/system/players/dvdplayer/avcodec-53-@ARCH@.so" #define DLL_PATH_LIBAVCODEC "special://xbmcbin/system/players/dvdplayer/avcodec-54-@ARCH@.so"
#define DLL_PATH_LIBAVFORMAT "special://xbmcbin/system/players/dvdplayer/avformat-53-@ARCH@.so" #define DLL_PATH_LIBAVFORMAT "special://xbmcbin/system/players/dvdplayer/avformat-54-@ARCH@.so"
#define DLL_PATH_LIBAVUTIL "special://xbmcbin/system/players/dvdplayer/avutil-51-@ARCH@.so" #define DLL_PATH_LIBAVUTIL "special://xbmcbin/system/players/dvdplayer/avutil-52-@ARCH@.so"
#define DLL_PATH_LIBPOSTPROC "special://xbmcbin/system/players/dvdplayer/postproc-52-@ARCH@.so" #define DLL_PATH_LIBPOSTPROC "special://xbmcbin/system/players/dvdplayer/postproc-52-@ARCH@.so"
#define DLL_PATH_LIBSWSCALE "special://xbmcbin/system/players/dvdplayer/swscale-2-@ARCH@.so" #define DLL_PATH_LIBSWSCALE "special://xbmcbin/system/players/dvdplayer/swscale-2-@ARCH@.so"
#define DLL_PATH_LIBAVFILTER "special://xbmcbin/system/players/dvdplayer/avfilter-2-@ARCH@.so" #define DLL_PATH_LIBAVFILTER "special://xbmcbin/system/players/dvdplayer/avfilter-3-@ARCH@.so"
#define DLL_PATH_LIBSWRESAMPLE "special://xbmcbin/system/players/dvdplayer/swresample-0-@ARCH@.so" #define DLL_PATH_LIBSWRESAMPLE "special://xbmcbin/system/players/dvdplayer/swresample-0-@ARCH@.so"


/* cdrip */ /* cdrip */
Expand Down
8 changes: 4 additions & 4 deletions xbmc/DllPaths_generated_android.h.in
View file
Open in desktop
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -74,12 +74,12 @@
#define DLL_PATH_LIBMAD "@MAD_SONAME@" #define DLL_PATH_LIBMAD "@MAD_SONAME@"


/* ffmpeg */ /* ffmpeg */
#define DLL_PATH_LIBAVCODEC "libavcodec-53-@ARCH@.so" #define DLL_PATH_LIBAVCODEC "libavcodec-54-@ARCH@.so"
#define DLL_PATH_LIBAVFORMAT "libavformat-53-@ARCH@.so" #define DLL_PATH_LIBAVFORMAT "libavformat-54-@ARCH@.so"
#define DLL_PATH_LIBAVUTIL "libavutil-51-@ARCH@.so" #define DLL_PATH_LIBAVUTIL "libavutil-52-@ARCH@.so"
#define DLL_PATH_LIBPOSTPROC "libpostproc-52-@ARCH@.so" #define DLL_PATH_LIBPOSTPROC "libpostproc-52-@ARCH@.so"
#define DLL_PATH_LIBSWSCALE "libswscale-2-@ARCH@.so" #define DLL_PATH_LIBSWSCALE "libswscale-2-@ARCH@.so"
#define DLL_PATH_LIBAVFILTER "libavfilter-2-@ARCH@.so" #define DLL_PATH_LIBAVFILTER "libavfilter-3-@ARCH@.so"
#define DLL_PATH_LIBSWRESAMPLE "libswresample-0-@ARCH@.so" #define DLL_PATH_LIBSWRESAMPLE "libswresample-0-@ARCH@.so"


/* cdrip */ /* cdrip */
Expand Down