[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [32197] trunk/lib/darwin-9.x.universal: Fix for [#23912]: Update 10.5 ffmpeg libs

Damien Plisson damien.plisson at yahoo.fr
Wed Sep 29 21:39:41 CEST 2010


Revision: 32197
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=32197
Author:   damien78
Date:     2010-09-29 21:39:41 +0200 (Wed, 29 Sep 2010)

Log Message:
-----------
Fix for [#23912]: Update 10.5 ffmpeg libs

Modified Paths:
--------------
    trunk/lib/darwin-9.x.universal/README
    trunk/lib/darwin-9.x.universal/ffmpeg/include/libavcodec/avcodec.h
    trunk/lib/darwin-9.x.universal/ffmpeg/include/libavcodec/opt.h
    trunk/lib/darwin-9.x.universal/ffmpeg/include/libavcodec/vdpau.h
    trunk/lib/darwin-9.x.universal/ffmpeg/include/libavcodec/xvmc.h
    trunk/lib/darwin-9.x.universal/ffmpeg/include/libavdevice/avdevice.h
    trunk/lib/darwin-9.x.universal/ffmpeg/include/libavformat/avformat.h
    trunk/lib/darwin-9.x.universal/ffmpeg/include/libavformat/avio.h
    trunk/lib/darwin-9.x.universal/ffmpeg/include/libavutil/adler32.h
    trunk/lib/darwin-9.x.universal/ffmpeg/include/libavutil/avstring.h
    trunk/lib/darwin-9.x.universal/ffmpeg/include/libavutil/avutil.h
    trunk/lib/darwin-9.x.universal/ffmpeg/include/libavutil/base64.h
    trunk/lib/darwin-9.x.universal/ffmpeg/include/libavutil/common.h
    trunk/lib/darwin-9.x.universal/ffmpeg/include/libavutil/crc.h
    trunk/lib/darwin-9.x.universal/ffmpeg/include/libavutil/fifo.h
    trunk/lib/darwin-9.x.universal/ffmpeg/include/libavutil/intfloat_readwrite.h
    trunk/lib/darwin-9.x.universal/ffmpeg/include/libavutil/log.h
    trunk/lib/darwin-9.x.universal/ffmpeg/include/libavutil/mathematics.h
    trunk/lib/darwin-9.x.universal/ffmpeg/include/libavutil/mem.h
    trunk/lib/darwin-9.x.universal/ffmpeg/include/libavutil/pixfmt.h
    trunk/lib/darwin-9.x.universal/ffmpeg/include/libavutil/rational.h
    trunk/lib/darwin-9.x.universal/ffmpeg/include/libavutil/sha1.h
    trunk/lib/darwin-9.x.universal/ffmpeg/include/libswscale/rgb2rgb.h
    trunk/lib/darwin-9.x.universal/ffmpeg/include/libswscale/swscale.h
    trunk/lib/darwin-9.x.universal/ffmpeg/lib/libavcodec.a
    trunk/lib/darwin-9.x.universal/ffmpeg/lib/libavdevice.a
    trunk/lib/darwin-9.x.universal/ffmpeg/lib/libavformat.a
    trunk/lib/darwin-9.x.universal/ffmpeg/lib/libavutil.a
    trunk/lib/darwin-9.x.universal/ffmpeg/lib/libmp3lame.a
    trunk/lib/darwin-9.x.universal/ffmpeg/lib/libswscale.a
    trunk/lib/darwin-9.x.universal/ffmpeg/lib/libx264.a

Added Paths:
-----------
    trunk/lib/darwin-9.x.universal/ffmpeg/include/libavutil/attributes.h
    trunk/lib/darwin-9.x.universal/ffmpeg/include/libavutil/avconfig.h
    trunk/lib/darwin-9.x.universal/ffmpeg/include/libavutil/error.h

Modified: trunk/lib/darwin-9.x.universal/README
===================================================================
--- trunk/lib/darwin-9.x.universal/README	2010-09-29 18:29:30 UTC (rev 32196)
+++ trunk/lib/darwin-9.x.universal/README	2010-09-29 19:39:41 UTC (rev 32197)
@@ -18,15 +18,15 @@
 openexr (version 1.4.0a)
 samplerate (version 0.1.7)
 fftw3 (version 3.2.2)
-ffmpeg (version 0.5)
+ffmpeg (version 0.6)
 ogg (version 1.1.4)
 vorbis (version 1.2.3)
 theora (version 1.1.1)
 flac (1.2.1)
 sndfile (version 1.0.21)
-lame (version 3.97)
+lame (version 3.98.4)
 xvidcore (version 1.2.2)
-x264 (version 20090331)
+x264 (version 20100928)
 opencollada (svn rev 768)
 
 
@@ -75,11 +75,11 @@
 
 
 LAME:
-./configure --host=x86_64-apple-darwin9.8.0 CC="gcc-4.2" CFLAGS="-arch x86_64 -march=core2 -isysroot /Developer/SDKs/MacOSX10.5.sdk -mmacosx-version-min=10.5" CXXFLAGS="-arch x86_64 -march=core2 -isysroot /Developer/SDKs/MacOSX10.5.sdk -mmacosx-version-min=10.5" LDFLAGS="-arch x86_64 -isysroot /Developer/SDKs/MacOSX10.5.sdk -mmacosx-version-min=10.5" 
+./configure --build=x86_64-apple-darwin9.8.0 CC="gcc-4.2" CFLAGS="-arch x86_64 -march=core2 -isysroot /Developer/SDKs/MacOSX10.5.sdk -mmacosx-version-min=10.5" CXXFLAGS="-arch x86_64 -march=core2 -isysroot /Developer/SDKs/MacOSX10.5.sdk -mmacosx-version-min=10.5" LDFLAGS="-arch x86_64 -isysroot /Developer/SDKs/MacOSX10.5.sdk -mmacosx-version-min=10.5" 
 
-./configure --host=i386-apple-darwin9.8.0 CC="gcc-4.2" CFLAGS="-arch i386 -march=prescott -isysroot /Developer/SDKs/MacOSX10.5.sdk -mmacosx-version-min=10.5" CXXFLAGS="-arch i386 -march=prescott -isysroot /Developer/SDKs/MacOSX10.5.sdk -mmacosx-version-min=10.5" LDFLAGS="-arch i386 -isysroot /Developer/SDKs/MacOSX10.5.sdk -mmacosx-version-min=10.5" 
+./configure --build=i386-apple-darwin9.8.0 CC="gcc-4.2" CFLAGS="-arch i386 -march=prescott -isysroot /Developer/SDKs/MacOSX10.5.sdk -mmacosx-version-min=10.5" CXXFLAGS="-arch i386 -march=prescott -isysroot /Developer/SDKs/MacOSX10.5.sdk -mmacosx-version-min=10.5" LDFLAGS="-arch i386 -isysroot /Developer/SDKs/MacOSX10.5.sdk -mmacosx-version-min=10.5" 
 
-./configure --host=powerpc-apple-darwin9.8.0 CC="gcc-4.2" CFLAGS="-arch ppc -mcpu=powerpc -isysroot /Developer/SDKs/MacOSX10.5.sdk -mmacosx-version-min=10.5" CXXFLAGS="-arch ppc -mcpu=powerpc -isysroot /Developer/SDKs/MacOSX10.5.sdk -mmacosx-version-min=10.5" LDFLAGS="-arch ppc -isysroot /Developer/SDKs/MacOSX10.5.sdk -mmacosx-version-min=10.5" 
+./configure --disable-shared --build=powerpc-apple-darwin9.8.0 CC="gcc-4.2" CFLAGS="-arch ppc -mcpu=powerpc -isysroot /Developer/SDKs/MacOSX10.5.sdk -mmacosx-version-min=10.5" CXXFLAGS="-arch ppc -mcpu=powerpc -isysroot /Developer/SDKs/MacOSX10.5.sdk -mmacosx-version-min=10.5" LDFLAGS="-arch ppc -isysroot /Developer/SDKs/MacOSX10.5.sdk -mmacosx-version-min=10.5" 
 
 
 XVIDCORE:
@@ -121,11 +121,11 @@
 
 
 FFMPEG:
-./configure --arch=x86_64 --cpu=core2 --disable-shared --enable-gpl --enable-zlib --disable-vhook --disable-ffserver --disable-ffplay --enable-swscale --enable-memalign-hack --enable-pthreads --disable-outdevs --disable-demuxer=alsa --enable-libmp3lame --enable-libx264 --enable-libxvid --enable-libtheora --enable-libvorbis --extra-cflags="-O3 -arch x86_64 -march=core2 -isysroot /Developer/SDKs/MacOSX10.5.sdk -mmacosx-version-min=10.5 -I/Users/damien/Documents/Dev/blender2.5/sources/x264-snapshot-20090331-2245 -I/Users/damien/Documents/Dev/blender2.5/sources/lame-3.97/include -I/Users/damien/Documents/Dev/blender2.5/sources/xvidcore/src -I/Users/damien/Documents/Dev/blender2.5/sources/libvorbis-1.2.3/include -I/Users/damien/Documents/Dev/blender2.5/sources/libtheora-1.1.1/include -I/Users/damien/Documents/Dev/blender2.5/sources/libogg-1.1.4/include" --extra-ldflags="-arch x86_64 -isysroot /Developer/SDKs/MacOSX10.5.sdk -mmacosx-version-min=10.5 -L/Users/damien/Documents/Dev/blender2.5/svnroot/lib/darwin-9.x.universal/ffmpeg/lib"
+./configure --arch=x86_64 --cpu=core2 --disable-shared --enable-gpl --enable-zlib --disable-ffserver --disable-ffplay --enable-swscale --enable-memalign-hack --enable-pthreads --disable-outdevs --disable-demuxer=alsa --enable-libmp3lame --enable-libx264 --enable-libxvid --enable-libtheora --enable-libvorbis --extra-cflags="-O3 -arch x86_64 -march=core2 -isysroot /Developer/SDKs/MacOSX10.5.sdk -mmacosx-version-min=10.5 -I/Users/damien/Documents/Dev/blender2.5/sources/x264-snapshot-20100928-2245 -I/Users/damien/Documents/Dev/blender2.5/sources/lame-3.98.4/include -I/Users/damien/Documents/Dev/blender2.5/sources/xvidcore/src -I/Users/damien/Documents/Dev/blender2.5/sources/libvorbis-1.2.3/include -I/Users/damien/Documents/Dev/blender2.5/sources/libtheora-1.1.1/include -I/Users/damien/Documents/Dev/blender2.5/sources/libogg-1.1.4/include" --extra-ldflags="-arch x86_64 -isysroot /Developer/SDKs/MacOSX10.5.sdk -mmacosx-version-min=10.5 -L/Users/damien/Documents/Dev/blender2.5/svnroot/lib/darwin-9.x.universal/ffmpeg/lib"
 
-./configure --arch=i386 --cpu=prescott --disable-shared --enable-gpl --enable-zlib --disable-vhook --disable-ffserver --disable-ffplay --enable-swscale --enable-memalign-hack --enable-pthreads --disable-outdevs --disable-demuxer=alsa --enable-libmp3lame --enable-libx264 --enable-libxvid --enable-libtheora --enable-libvorbis --extra-cflags="-O3 -arch i386 -march=prescott -isysroot /Developer/SDKs/MacOSX10.5.sdk -mmacosx-version-min=10.5 -I/Users/damien/Documents/Dev/blender2.5/sources/x264-snapshot-20090331-2245 -I/Users/damien/Documents/Dev/blender2.5/sources/lame-3.97/include -I/Users/damien/Documents/Dev/blender2.5/sources/xvidcore/src -I/Users/damien/Documents/Dev/blender2.5/sources/libvorbis-1.2.3/include -I/Users/damien/Documents/Dev/blender2.5/sources/libtheora-1.1.1/include -I/Users/damien/Documents/Dev/blender2.5/sources/libogg-1.1.4/include" --extra-ldflags="-arch i386 -isysroot /Developer/SDKs/MacOSX10.5.sdk -mmacosx-version-min=10.5 -L/Users/damien/Documents/Dev/blender2.5/svnroot/lib/darwin-9.x.universal/ffmpeg/lib"
+./configure --arch=i386 --cpu=prescott --disable-shared --enable-gpl --enable-zlib --disable-ffserver --disable-ffplay --enable-swscale --enable-memalign-hack --enable-pthreads --disable-outdevs --disable-demuxer=alsa --enable-libmp3lame --enable-libx264 --enable-libxvid --enable-libtheora --enable-libvorbis --extra-cflags="-O3 -arch i386 -march=prescott -isysroot /Developer/SDKs/MacOSX10.5.sdk -mmacosx-version-min=10.5 -I/Users/damien/Documents/Dev/blender2.5/sources/x264-snapshot-20100928-2245 -I/Users/damien/Documents/Dev/blender2.5/sources/lame-3.98.4/include -I/Users/damien/Documents/Dev/blender2.5/sources/xvidcore/src -I/Users/damien/Documents/Dev/blender2.5/sources/libvorbis-1.2.3/include -I/Users/damien/Documents/Dev/blender2.5/sources/libtheora-1.1.1/include -I/Users/damien/Documents/Dev/blender2.5/sources/libogg-1.1.4/include" --extra-ldflags="-arch i386 -isysroot /Developer/SDKs/MacOSX10.5.sdk -mmacosx-version-min=10.5 -L/Users/damien/Documents/Dev/blender2.5/svnroot/lib/darwin-9.x.universal/ffmpeg/lib"
 
-./configure --arch=ppc --disable-shared --enable-gpl --enable-zlib --disable-vhook --disable-ffserver --disable-ffplay --enable-swscale --enable-memalign-hack --enable-pthreads --disable-outdevs --disable-demuxer=alsa --enable-libmp3lame --enable-libx264 --enable-libxvid --enable-libtheora --enable-libvorbis --extra-cflags="-O3 -arch ppc -mcpu=powerpc -isysroot /Developer/SDKs/MacOSX10.5.sdk -mmacosx-version-min=10.5 -I/Users/damien/Documents/Dev/blender2.5/sources/x264-snapshot-20090331-2245 -I/Users/damien/Documents/Dev/blender2.5/sources/lame-3.97/include -I/Users/damien/Documents/Dev/blender2.5/sources/xvidcore/src -I/Users/damien/Documents/Dev/blender2.5/sources/libvorbis-1.2.3/include -I/Users/damien/Documents/Dev/blender2.5/sources/libtheora-1.1.1/include -I/Users/damien/Documents/Dev/blender2.5/sources/libogg-1.1.4/include" --extra-ldflags="-arch ppc -isysroot /Developer/SDKs/MacOSX10.5.sdk -mmacosx-version-min=10.5 -L/Users/damien/Documents/Dev/blender2.5/svnroot/lib/darwin-9.x.universal/ffmpeg/lib"
+./configure --arch=ppc --disable-shared --enable-gpl --enable-zlib --disable-ffserver --disable-ffplay --enable-swscale --enable-memalign-hack --enable-pthreads --disable-outdevs --disable-demuxer=alsa --enable-libmp3lame --enable-libx264 --enable-libxvid --enable-libtheora --enable-libvorbis --extra-cflags="-O3 -arch ppc -mcpu=powerpc -isysroot /Developer/SDKs/MacOSX10.5.sdk -mmacosx-version-min=10.5 -I/Users/damien/Documents/Dev/blender2.5/sources/x264-snapshot-20100928-2245 -I/Users/damien/Documents/Dev/blender2.5/sources/lame-3.98.4/include -I/Users/damien/Documents/Dev/blender2.5/sources/xvidcore/src -I/Users/damien/Documents/Dev/blender2.5/sources/libvorbis-1.2.3/include -I/Users/damien/Documents/Dev/blender2.5/sources/libtheora-1.1.1/include -I/Users/damien/Documents/Dev/blender2.5/sources/libogg-1.1.4/include" --extra-ldflags="-arch ppc -isysroot /Developer/SDKs/MacOSX10.5.sdk -mmacosx-version-min=10.5 -L/Users/damien/Documents/Dev/blender2.5/svnroot/lib/darwin-9.x.universal/ffmpeg/lib"
 
 FLAC:
 ./configure --disable-shared --enable-sse --disable-doxygen-docs --disable-xmms-plugin --with-ogg-libraries=/Users/damien/Documents/Dev/blender2.5/svnroot/lib/darwin-9.x.universal/ffmpeg/lib --with-ogg-includes=/Users/damien/Documents/Dev/blender2.5/sources/libogg-1.1.4/include --build=x86_64-apple-darwin9.8.0 CC="gcc-4.2" CFLAGS="-arch x86_64 -mfpmath=sse -march=core2 -isysroot /Developer/SDKs/MacOSX10.5.sdk -mmacosx-version-min=10.5" CXXFLAGS="-arch x86_64 -mfpmath=sse -march=core2 -isysroot /Developer/SDKs/MacOSX10.5.sdk -mmacosx-version-min=10.5" LDFLAGS="-arch x86_64 -mfpmath=sse -march=core2 -isysroot /Developer/SDKs/MacOSX10.5.sdk -mmacosx-version-min=10.5"

Modified: trunk/lib/darwin-9.x.universal/ffmpeg/include/libavcodec/avcodec.h
===================================================================
--- trunk/lib/darwin-9.x.universal/ffmpeg/include/libavcodec/avcodec.h	2010-09-29 18:29:30 UTC (rev 32196)
+++ trunk/lib/darwin-9.x.universal/ffmpeg/include/libavcodec/avcodec.h	2010-09-29 19:39:41 UTC (rev 32197)
@@ -22,7 +22,7 @@
 #define AVCODEC_AVCODEC_H
 
 /**
- * @file libavcodec/avcodec.h
+ * @file
  * external API header
  */
 
@@ -30,8 +30,8 @@
 #include "libavutil/avutil.h"
 

@@ Diff output truncated at 10240 characters. @@




More information about the Bf-blender-cvs mailing list