actions/itgmania212121
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

corec's fixes (to my recent commits) from issue 138 (http://ssc.ajworld.net/sm-ssc/bugtracker/view.php?id=138)

Browse Source
This commit is contained in:
AJ Kelly
2010-05-22 09:52:20 -05:00
parent 894f6684d9
commit 40bd873561
2 changed files with 68 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files
autoconf/m4/video.m4
+1
View File
@@ -26,6 +26,7 @@ if test "$with_ffmpeg" != "no"; then
AC_SEARCH_LIBS(guess_format, [avformat], have_libavformat=yes, have_libavformat=no) AC_SEARCH_LIBS(guess_format, [avformat], have_libavformat=yes, have_libavformat=no)
AC_SEARCH_LIBS(sws_scale, [swscale], have_libswscale=yes, have_libswscale=no) AC_SEARCH_LIBS(sws_scale, [swscale], have_libswscale=yes, have_libswscale=no)
fi fi
fi
have_ffmpeg=no have_ffmpeg=no
if test "$have_libavutil" = "yes" -a "$have_libavformat" = "yes" -a "$have_libavcodec" = "yes" -a "$have_libswscale" = "yes"; then if test "$have_libavutil" = "yes" -a "$have_libavformat" = "yes" -a "$have_libavcodec" = "yes" -a "$have_libswscale" = "yes"; then
src/arch/MovieTexture/MovieTexture_FFMpeg.cpp
+1 -1
View File
@@ -695,7 +695,7 @@ int URLRageFile_write( avcodec::URLContext *h, unsigned char *buf, int size )
#if defined(MACOSX) #if defined(MACOSX)
avcodec::offset_t URLRageFile_seek( avcodec::URLContext *h, avcodec::offset_t pos, int whence ) avcodec::offset_t URLRageFile_seek( avcodec::URLContext *h, avcodec::offset_t pos, int whence )
#else #else
int64_t URLRageFile_seek( avcodec::URLContext *h, avcodec::int64_t pos, int whence ) int64_t URLRageFile_seek( avcodec::URLContext *h, int64_t pos, int whence )
#endif #endif
{ {
RageFileBasic *f = (RageFileBasic *) h->priv_data; RageFileBasic *f = (RageFileBasic *) h->priv_data;