[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [33293] trunk/lib/darwin-8.x.i386: OSX/ Cocoa 10.4 i386 libs: Fix for [#24266] Update x264 & ffmpeg libs to fix colorant issue with h264

Damien Plisson damien.plisson at yahoo.fr
Wed Nov 24 18:36:31 CET 2010 

Revision: 33293
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=33293
Author:   damien78
Date:     2010-11-24 18:36:31 +0100 (Wed, 24 Nov 2010)

Log Message:
-----------
OSX/Cocoa 10.4 i386 libs: Fix for [#24266] Update x264 & ffmpeg libs to fix colorant issue with h264
Also updated libogg & libvorbis

Modified Paths:
--------------
    trunk/lib/darwin-8.x.i386/README
    trunk/lib/darwin-8.x.i386/ffmpeg/include/libavformat/avformat.h
    trunk/lib/darwin-8.x.i386/ffmpeg/include/libavutil/avconfig.h
    trunk/lib/darwin-8.x.i386/ffmpeg/lib/libavcodec.a
    trunk/lib/darwin-8.x.i386/ffmpeg/lib/libavdevice.a
    trunk/lib/darwin-8.x.i386/ffmpeg/lib/libavformat.a
    trunk/lib/darwin-8.x.i386/ffmpeg/lib/libavutil.a
    trunk/lib/darwin-8.x.i386/ffmpeg/lib/libogg.a
    trunk/lib/darwin-8.x.i386/ffmpeg/lib/libswscale.a
    trunk/lib/darwin-8.x.i386/ffmpeg/lib/libtheora.a
    trunk/lib/darwin-8.x.i386/ffmpeg/lib/libtheoradec.a
    trunk/lib/darwin-8.x.i386/ffmpeg/lib/libtheoraenc.a
    trunk/lib/darwin-8.x.i386/ffmpeg/lib/libvorbis.a
    trunk/lib/darwin-8.x.i386/ffmpeg/lib/libvorbisenc.a
    trunk/lib/darwin-8.x.i386/ffmpeg/lib/libvorbisfile.a
    trunk/lib/darwin-8.x.i386/ffmpeg/lib/libx264.a

Modified: trunk/lib/darwin-8.x.i386/README
===================================================================
--- trunk/lib/darwin-8.x.i386/README	2010-11-24 17:29:22 UTC (rev 33292)
+++ trunk/lib/darwin-8.x.i386/README	2010-11-24 17:36:31 UTC (rev 33293)
@@ -1,12 +1,12 @@
 lcms (version 1.19)
 tiff (version 3.9.2)
-ffmpeg (version 0.6)
-ogg (version 1.1.4)
-vorbis (version 1.2.3)
+ffmpeg (version 0.6.1)
+ogg (version 1.2.1)
+vorbis (version 1.3.2)
 theora (version 1.1.1)
 lame (version 3.98.4)
 xvidcore (version 1.2.2)
-x264 (version 20100928)
+x264 (version 20101118)
 flac (version 1.2.1)
 sndfile (version 1.0.21)
 opencollada (svn rev 775)
@@ -37,20 +37,20 @@
 ./configure --host=i386-apple-darwin8.11.0 CFLAGS="-arch i386 -mfpmath=sse -march=prescott -isysroot /Developer/SDKs/MacOSX10.4u.sdk -mmacosx-version-min=10.4" CXXFLAGS="-arch i386 -mfpmath=sse -march=prescott -isysroot /Developer/SDKs/MacOSX10.4u.sdk -mmacosx-version-min=10.4" LDFLAGS="-arch i386 -mfpmath=sse -march=prescott -isysroot /Developer/SDKs/MacOSX10.4u.sdk -mmacosx-version-min=10.4"
 
 VORBIS:
-./configure --host=i386-apple-darwin8.11.0 CC="gcc-4.0" CFLAGS="-arch i386 -mfpmath=sse -march=prescott -isysroot /Developer/SDKs/MacOSX10.4u.sdk -mmacosx-version-min=10.4" CXXFLAGS="-arch i386 -mfpmath=sse -march=prescott -isysroot /Developer/SDKs/MacOSX10.4u.sdk -mmacosx-version-min=10.4" LDFLAGS="-arch i386 -mfpmath=sse -march=prescott -isysroot /Developer/SDKs/MacOSX10.4u.sdk -mmacosx-version-min=10.4" --with-ogg-libraries=/Users/damien/Documents/Dev/blender2.5/sources/libogg-1.1.4 --with-ogg-includes=/Users/damien/Documents/Dev/blender2.5/sources/libogg-1.1.4/include
+./configure --host=i386-apple-darwin8.11.0 CC="gcc-4.0" CFLAGS="-arch i386 -mfpmath=sse -march=prescott -isysroot /Developer/SDKs/MacOSX10.4u.sdk -mmacosx-version-min=10.4" CXXFLAGS="-arch i386 -mfpmath=sse -march=prescott -isysroot /Developer/SDKs/MacOSX10.4u.sdk -mmacosx-version-min=10.4" LDFLAGS="-arch i386 -mfpmath=sse -march=prescott -isysroot /Developer/SDKs/MacOSX10.4u.sdk -mmacosx-version-min=10.4" --with-ogg-libraries=/Users/damien/Documents/Dev/blender2.5/svnroot/lib/darwin-8.x.i386/ffmpeg/lib --with-ogg-includes=/Users/damien/Documents/Dev/blender2.5/sources/libogg-1.2.1/include
 
 THEORA:
-./configure --host=i386-apple-darwin8.11.0 CC="gcc-4.0" CFLAGS="-arch i386 -mfpmath=sse -march=prescott -isysroot /Developer/SDKs/MacOSX10.4u.sdk -mmacosx-version-min=10.4" CXXFLAGS="-arch i386 -mfpmath=sse -march=prescott -isysroot /Developer/SDKs/MacOSX10.4u.sdk -mmacosx-version-min=10.4" LDFLAGS="-arch i386 -mfpmath=sse -march=prescott -isysroot /Developer/SDKs/MacOSX10.4u.sdk -mmacosx-version-min=10.4" --with-ogg-libraries=/Users/damien/Documents/Dev/blender2.5/sources/libogg-1.1.4 --with-ogg-includes=/Users/damien/Documents/Dev/blender2.5/sources/libogg-1.1.4/include --with-vorbis-libraries=/Users/damien/Documents/Dev/blender2.5/sources/libvorbis-1.2.3/output --with-vorbis-includes=/Users/damien/Documents/Dev/blender2.5/sources/libvorbis-1.2.3/include
+./configure --host=i386-apple-darwin8.11.0 CC="gcc-4.0" CFLAGS="-arch i386 -mfpmath=sse -march=prescott -isysroot /Developer/SDKs/MacOSX10.4u.sdk -mmacosx-version-min=10.4" CXXFLAGS="-arch i386 -mfpmath=sse -march=prescott -isysroot /Developer/SDKs/MacOSX10.4u.sdk -mmacosx-version-min=10.4" LDFLAGS="-arch i386 -mfpmath=sse -march=prescott -isysroot /Developer/SDKs/MacOSX10.4u.sdk -mmacosx-version-min=10.4" --with-ogg-libraries=/Users/damien/Documents/Dev/blender2.5/svnroot/lib/darwin-8.x.i386/ffmpeg/lib --with-ogg-includes=/Users/damien/Documents/Dev/blender2.5/sources/libogg-1.2.1/include --with-vorbis-libraries=/Users/damien/Documents/Dev/blender2.5/svnroot/lib/darwin-8.x.i386/ffmpeg/lib --with-vorbis-includes=/Users/damien/Documents/Dev/blender2.5/sources/libvorbis-1.3.2/include
 
 
 FFMPEG:
-./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 --cc=gcc-4.0 --extra-cflags="-O3 -arch i386 -march=prescott -isysroot /Developer/SDKs/MacOSX10.4u.sdk -mmacosx-version-min=10.4 -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.4u.sdk -mmacosx-version-min=10.4 -L/Users/damien/Documents/Dev/blender2.5/svnroot/lib/darwin-8.x.i386/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 --cc=gcc-4.0 --extra-cflags="-O3 -arch i386 -march=prescott -isysroot /Developer/SDKs/MacOSX10.4u.sdk -mmacosx-version-min=10.4 -I/Users/damien/Documents/Dev/blender2.5/sources/x264-snapshot-20101118-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.3.2/include -I/Users/damien/Documents/Dev/blender2.5/sources/libtheora-1.1.1/include -I/Users/damien/Documents/Dev/blender2.5/sources/libogg-1.2.1/include" --extra-ldflags="-arch i386 -isysroot /Developer/SDKs/MacOSX10.4u.sdk -mmacosx-version-min=10.4 -L/Users/damien/Documents/Dev/blender2.5/svnroot/lib/darwin-8.x.i386/ffmpeg/lib"
 
 FLAC:
-./configure --disable-shared --enable-sse --disable-doxygen-docs --disable-xmms-plugin --disable-asm-optimizations --with-ogg-libraries=/Users/damien/Documents/Dev/blender2.5/svnroot/lib/darwin-8.x.i386/ffmpeg/lib --with-ogg-includes=/Users/damien/Documents/Dev/blender2.5/sources/libogg-1.1.4/include --build=i386-apple-darwin9.8.0 CC="gcc-4.0" CXX="g++-4.0" CFLAGS="-arch i386 -mfpmath=sse -march=prescott -isysroot /Developer/SDKs/MacOSX10.4u.sdk -mmacosx-version-min=10.4" CXXFLAGS="-arch i386 -mfpmath=sse -march=prescott -isysroot /Developer/SDKs/MacOSX10.4u.sdk -mmacosx-version-min=10.4" LDFLAGS="-arch i386 -mfpmath=sse -march=prescott -isysroot /Developer/SDKs/MacOSX10.4u.sdk -mmacosx-version-min=10.4"
+./configure --disable-shared --enable-sse --disable-doxygen-docs --disable-xmms-plugin --disable-asm-optimizations --with-ogg-libraries=/Users/damien/Documents/Dev/blender2.5/svnroot/lib/darwin-8.x.i386/ffmpeg/lib --with-ogg-includes=/Users/damien/Documents/Dev/blender2.5/sources/libogg-1.2.1/include --build=i386-apple-darwin9.8.0 CC="gcc-4.0" CXX="g++-4.0" CFLAGS="-arch i386 -mfpmath=sse -march=prescott -isysroot /Developer/SDKs/MacOSX10.4u.sdk -mmacosx-version-min=10.4" CXXFLAGS="-arch i386 -mfpmath=sse -march=prescott -isysroot /Developer/SDKs/MacOSX10.4u.sdk -mmacosx-version-min=10.4" LDFLAGS="-arch i386 -mfpmath=sse -march=prescott -isysroot /Developer/SDKs/MacOSX10.4u.sdk -mmacosx-version-min=10.4"
 
 SNDFILE:
-./configure --disable-shared --disable-sqlite --build=i386-apple-darwin9.8.0 CC="gcc-4.0" CXX="g++-4.0" CFLAGS="-arch i386 -mfpmath=sse -march=prescott -isysroot /Developer/SDKs/MacOSX10.4u.sdk -mmacosx-version-min=10.4 -I/Users/damien/Documents/Dev/blender2.5/sources/libogg-1.1.4/include -I/Users/damien/Documents/Dev/blender2.5/sources/libvorbis-1.2.3/include -I/Users/damien/Documents/Dev/blender2.5/sources/flac-1.2.1/include" CXXFLAGS="-arch i386 -mfpmath=sse -march=prescott -isysroot /Developer/SDKs/MacOSX10.4u.sdk -mmacosx-version-min=10.4 -I/Users/damien/Documents/Dev/blender2.5/sources/libogg-1.1.4/include -I/Users/damien/Documents/Dev/blender2.5/sources/libvorbis-1.2.3/include -I/Users/damien/Documents/Dev/blender2.5/sources/flac-1.2.1/include" LDFLAGS="-arch i386 -mfpmath=sse -march=prescott -isysroot /Developer/SDKs/MacOSX10.4u.sdk -mmacosx-version-min=10.4 -L/Users/damien/Documents/Dev/blender2.5/svnroot/lib/darwin-8.x.i386/ffmpeg/lib -L/Users/damien/Documents/Dev/blender2.5/svnroot/lib/darwin-8.x.i386/sndfile/lib" LIBS="-logg -lvorbis -lvorbisenc -lFLAC"
+./configure --disable-shared --disable-sqlite --build=i386-apple-darwin9.8.0 CC="gcc-4.0" CXX="g++-4.0" CFLAGS="-arch i386 -mfpmath=sse -march=prescott -isysroot /Developer/SDKs/MacOSX10.4u.sdk -mmacosx-version-min=10.4 -I/Users/damien/Documents/Dev/blender2.5/sources/libogg-1.2.1/include -I/Users/damien/Documents/Dev/blender2.5/sources/libvorbis-1.2.3/include -I/Users/damien/Documents/Dev/blender2.5/sources/flac-1.2.1/include" CXXFLAGS="-arch i386 -mfpmath=sse -march=prescott -isysroot /Developer/SDKs/MacOSX10.4u.sdk -mmacosx-version-min=10.4 -I/Users/damien/Documents/Dev/blender2.5/sources/libogg-1.2.1/include -I/Users/damien/Documents/Dev/blender2.5/sources/libvorbis-1.2.3/include -I/Users/damien/Documents/Dev/blender2.5/sources/flac-1.2.1/include" LDFLAGS="-arch i386 -mfpmath=sse -march=prescott -isysroot /Developer/SDKs/MacOSX10.4u.sdk -mmacosx-version-min=10.4 -L/Users/damien/Documents/Dev/blender2.5/svnroot/lib/darwin-8.x.i386/ffmpeg/lib -L/Users/damien/Documents/Dev/blender2.5/svnroot/lib/darwin-8.x.i386/sndfile/lib" LIBS="-logg -lvorbis -lvorbisenc -lFLAC"
 
 OPENCOLLADA:
 patch the OpenCollada Sconstruct file with opencollada/collada_OSXbuild.patch

Modified: trunk/lib/darwin-8.x.i386/ffmpeg/include/libavformat/avformat.h
===================================================================
--- trunk/lib/darwin-8.x.i386/ffmpeg/include/libavformat/avformat.h	2010-11-24 17:29:22 UTC (rev 33292)
+++ trunk/lib/darwin-8.x.i386/ffmpeg/include/libavformat/avformat.h	2010-11-24 17:36:31 UTC (rev 33293)
@@ -869,8 +869,22 @@
  */
 void av_register_all(void);
 
-/** codec tag <-> codec id */
+/**
+ * Gets the CodecID for the given codec tag tag.
+ * If no codec id is found returns CODEC_ID_NONE.
+ *
+ * @param tags list of supported codec_id-codec_tag pairs, as stored

@@ Diff output truncated at 10240 characters. @@

More information about the Bf-blender-cvs mailing list