[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [32199] trunk/lib/darwin-8.x.i386: Fix for [#23912]: Update 10.4 i386 ffmpeg libs
Damien Plisson
damien.plisson at yahoo.fr
Wed Sep 29 22:11:46 CEST 2010
Revision: 32199
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=32199
Author: damien78
Date: 2010-09-29 22:11:44 +0200 (Wed, 29 Sep 2010)
Log Message:
-----------
Fix for [#23912]: Update 10.4 i386 ffmpeg libs
Modified Paths:
--------------
trunk/lib/darwin-8.x.i386/README
trunk/lib/darwin-8.x.i386/ffmpeg/include/libavcodec/avcodec.h
trunk/lib/darwin-8.x.i386/ffmpeg/include/libavcodec/opt.h
trunk/lib/darwin-8.x.i386/ffmpeg/include/libavcodec/vdpau.h
trunk/lib/darwin-8.x.i386/ffmpeg/include/libavcodec/xvmc.h
trunk/lib/darwin-8.x.i386/ffmpeg/include/libavdevice/avdevice.h
trunk/lib/darwin-8.x.i386/ffmpeg/include/libavformat/avformat.h
trunk/lib/darwin-8.x.i386/ffmpeg/include/libavformat/avio.h
trunk/lib/darwin-8.x.i386/ffmpeg/include/libavutil/adler32.h
trunk/lib/darwin-8.x.i386/ffmpeg/include/libavutil/avstring.h
trunk/lib/darwin-8.x.i386/ffmpeg/include/libavutil/avutil.h
trunk/lib/darwin-8.x.i386/ffmpeg/include/libavutil/base64.h
trunk/lib/darwin-8.x.i386/ffmpeg/include/libavutil/common.h
trunk/lib/darwin-8.x.i386/ffmpeg/include/libavutil/crc.h
trunk/lib/darwin-8.x.i386/ffmpeg/include/libavutil/fifo.h
trunk/lib/darwin-8.x.i386/ffmpeg/include/libavutil/intfloat_readwrite.h
trunk/lib/darwin-8.x.i386/ffmpeg/include/libavutil/log.h
trunk/lib/darwin-8.x.i386/ffmpeg/include/libavutil/mathematics.h
trunk/lib/darwin-8.x.i386/ffmpeg/include/libavutil/mem.h
trunk/lib/darwin-8.x.i386/ffmpeg/include/libavutil/pixfmt.h
trunk/lib/darwin-8.x.i386/ffmpeg/include/libavutil/rational.h
trunk/lib/darwin-8.x.i386/ffmpeg/include/libavutil/sha1.h
trunk/lib/darwin-8.x.i386/ffmpeg/include/libswscale/rgb2rgb.h
trunk/lib/darwin-8.x.i386/ffmpeg/include/libswscale/swscale.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/libmp3lame.a
trunk/lib/darwin-8.x.i386/ffmpeg/lib/libswscale.a
trunk/lib/darwin-8.x.i386/ffmpeg/lib/libx264.a
Added Paths:
-----------
trunk/lib/darwin-8.x.i386/ffmpeg/include/libavutil/attributes.h
trunk/lib/darwin-8.x.i386/ffmpeg/include/libavutil/avconfig.h
trunk/lib/darwin-8.x.i386/ffmpeg/include/libavutil/error.h
Modified: trunk/lib/darwin-8.x.i386/README
===================================================================
--- trunk/lib/darwin-8.x.i386/README 2010-09-29 20:01:52 UTC (rev 32198)
+++ trunk/lib/darwin-8.x.i386/README 2010-09-29 20:11:44 UTC (rev 32199)
@@ -1,12 +1,12 @@
lcms (version 1.19)
tiff (version 3.9.2)
-ffmpeg (version 0.5)
+ffmpeg (version 0.6)
ogg (version 1.1.4)
vorbis (version 1.2.3)
theora (version 1.1.1)
-lame (version 3.97)
+lame (version 3.98.4)
xvidcore (version 1.2.2)
-x264 (version 20090331)
+x264 (version 20100928)
flac (version 1.2.1)
sndfile (version 1.0.21)
opencollada (svn rev 768)
@@ -21,7 +21,7 @@
./configure --disable-shared --with-jpeg-include-dir=/Users/damien/Documents/Dev/blender2.5/svnroot/lib/darwin-8.x.i386/jpeg/include --with-jpeg-lib-dir=/Users/damien/Documents/Dev/blender2.5/svnroot/lib/darwin-8.x.i386/jpeg/lib --with-apple-opengl-framework --build=i386-apple-darwin8.11.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"
LAME:
-./configure --host=i386-apple-darwin8.11.0 CC="gcc-4.0" CFLAGS="-arch i386 -march=prescott -isysroot /Developer/SDKs/MacOSX10.4u.sdk -mmacosx-version-min=10.4" CXXFLAGS="-arch i386 -march=prescott -isysroot /Developer/SDKs/MacOSX10.4u.sdk -mmacosx-version-min=10.4" LDFLAGS="-arch i386 -isysroot /Developer/SDKs/MacOSX10.4u.sdk -mmacosx-version-min=10.4"
+./configure --build=i386-apple-darwin8.11.0 CC="gcc-4.0" CFLAGS="-arch i386 -march=prescott -isysroot /Developer/SDKs/MacOSX10.4u.sdk -mmacosx-version-min=10.4" CXXFLAGS="-arch i386 -march=prescott -isysroot /Developer/SDKs/MacOSX10.4u.sdk -mmacosx-version-min=10.4" LDFLAGS="-arch i386 -isysroot /Developer/SDKs/MacOSX10.4u.sdk -mmacosx-version-min=10.4"
XVIDCORE:
@@ -44,7 +44,7 @@
FFMPEG:
-./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 --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-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.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-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"
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"
Modified: trunk/lib/darwin-8.x.i386/ffmpeg/include/libavcodec/avcodec.h
===================================================================
--- trunk/lib/darwin-8.x.i386/ffmpeg/include/libavcodec/avcodec.h 2010-09-29 20:01:52 UTC (rev 32198)
+++ trunk/lib/darwin-8.x.i386/ffmpeg/include/libavcodec/avcodec.h 2010-09-29 20:11:44 UTC (rev 32199)
@@ -22,7 +22,7 @@
#define AVCODEC_AVCODEC_H
/**
- * @file libavcodec/avcodec.h
+ * @file
* external API header
*/
@@ -30,8 +30,8 @@
#include "libavutil/avutil.h"
#define LIBAVCODEC_VERSION_MAJOR 52
-#define LIBAVCODEC_VERSION_MINOR 20
-#define LIBAVCODEC_VERSION_MICRO 0
+#define LIBAVCODEC_VERSION_MINOR 72
+#define LIBAVCODEC_VERSION_MICRO 2
#define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \
LIBAVCODEC_VERSION_MINOR, \
@@ -125,7 +125,9 @@
CODEC_ID_QDRAW,
CODEC_ID_VIXL,
CODEC_ID_QPEG,
+#if LIBAVCODEC_VERSION_MAJOR < 53
CODEC_ID_XVID,
+#endif
CODEC_ID_PNG,
CODEC_ID_PPM,
CODEC_ID_PBM,
@@ -191,6 +193,24 @@
CODEC_ID_TGV,
CODEC_ID_TGQ,
CODEC_ID_TQI,
+ CODEC_ID_AURA,
+ CODEC_ID_AURA2,
+ CODEC_ID_V210X,
+ CODEC_ID_TMV,
+ CODEC_ID_V210,
+ CODEC_ID_DPX,
+ CODEC_ID_MAD,
+ CODEC_ID_FRWU,
+ CODEC_ID_FLASHSV2,
+ CODEC_ID_CDGRAPHICS,
+ CODEC_ID_R210,
+ CODEC_ID_ANM,
+ CODEC_ID_BINKVIDEO,
+ CODEC_ID_IFF_ILBM,
+ CODEC_ID_IFF_BYTERUN1,
+ CODEC_ID_KGV1,
+ CODEC_ID_YOP,
+ CODEC_ID_VP8,
/* various PCM "codecs" */
CODEC_ID_PCM_S16LE= 0x10000,
@@ -217,6 +237,7 @@
CODEC_ID_PCM_F32LE,
CODEC_ID_PCM_F64BE,
CODEC_ID_PCM_F64LE,
+ CODEC_ID_PCM_BLURAY,
/* various ADPCM codecs */
CODEC_ID_ADPCM_IMA_QT= 0x11000,
@@ -309,6 +330,12 @@
CODEC_ID_EAC3,
CODEC_ID_SIPR,
CODEC_ID_MP1,
+ CODEC_ID_TWINVQ,
+ CODEC_ID_TRUEHD,
+ CODEC_ID_MP4ALS,
+ CODEC_ID_ATRAC1,
+ CODEC_ID_BINKAUDIO_RDFT,
+ CODEC_ID_BINKAUDIO_DCT,
/* subtitle codecs */
CODEC_ID_DVD_SUBTITLE= 0x17000,
@@ -317,6 +344,8 @@
CODEC_ID_XSUB,
CODEC_ID_SSA,
CODEC_ID_MOV_TEXT,
+ CODEC_ID_HDMV_PGS_SUBTITLE,
+ CODEC_ID_DVB_TELETEXT,
/* other specific kind of codecs (generally used for attachments) */
CODEC_ID_TTF= 0x18000,
@@ -327,16 +356,18 @@
* stream (only used by libavformat) */
};
-enum CodecType {
- CODEC_TYPE_UNKNOWN = -1,
- CODEC_TYPE_VIDEO,
- CODEC_TYPE_AUDIO,
- CODEC_TYPE_DATA,
- CODEC_TYPE_SUBTITLE,
- CODEC_TYPE_ATTACHMENT,
- CODEC_TYPE_NB
-};
+#if LIBAVCODEC_VERSION_MAJOR < 53
+#define CodecType AVMediaType
+#define CODEC_TYPE_UNKNOWN AVMEDIA_TYPE_UNKNOWN
+#define CODEC_TYPE_VIDEO AVMEDIA_TYPE_VIDEO
+#define CODEC_TYPE_AUDIO AVMEDIA_TYPE_AUDIO
+#define CODEC_TYPE_DATA AVMEDIA_TYPE_DATA
+#define CODEC_TYPE_SUBTITLE AVMEDIA_TYPE_SUBTITLE
+#define CODEC_TYPE_ATTACHMENT AVMEDIA_TYPE_ATTACHMENT
+#define CODEC_TYPE_NB AVMEDIA_TYPE_NB
+#endif
+
/**
* all in native-endian format
*/
@@ -372,16 +403,26 @@
#define CH_STEREO_LEFT 0x20000000 ///< Stereo downmix.
#define CH_STEREO_RIGHT 0x40000000 ///< See CH_STEREO_LEFT.
+/** Channel mask value used for AVCodecContext.request_channel_layout
+ to indicate that the user requests the channel order of the decoder output
+ to be the native codec channel order. */
+#define CH_LAYOUT_NATIVE 0x8000000000000000LL
+
/* Audio channel convenience macros */
#define CH_LAYOUT_MONO (CH_FRONT_CENTER)
#define CH_LAYOUT_STEREO (CH_FRONT_LEFT|CH_FRONT_RIGHT)
+#define CH_LAYOUT_2_1 (CH_LAYOUT_STEREO|CH_BACK_CENTER)
#define CH_LAYOUT_SURROUND (CH_LAYOUT_STEREO|CH_FRONT_CENTER)
+#define CH_LAYOUT_4POINT0 (CH_LAYOUT_SURROUND|CH_BACK_CENTER)
+#define CH_LAYOUT_2_2 (CH_LAYOUT_STEREO|CH_SIDE_LEFT|CH_SIDE_RIGHT)
#define CH_LAYOUT_QUAD (CH_LAYOUT_STEREO|CH_BACK_LEFT|CH_BACK_RIGHT)
#define CH_LAYOUT_5POINT0 (CH_LAYOUT_SURROUND|CH_SIDE_LEFT|CH_SIDE_RIGHT)
#define CH_LAYOUT_5POINT1 (CH_LAYOUT_5POINT0|CH_LOW_FREQUENCY)
+#define CH_LAYOUT_5POINT0_BACK (CH_LAYOUT_SURROUND|CH_BACK_LEFT|CH_BACK_RIGHT)
+#define CH_LAYOUT_5POINT1_BACK (CH_LAYOUT_5POINT0_BACK|CH_LOW_FREQUENCY)
+#define CH_LAYOUT_7POINT0 (CH_LAYOUT_5POINT0|CH_BACK_LEFT|CH_BACK_RIGHT)
#define CH_LAYOUT_7POINT1 (CH_LAYOUT_5POINT1|CH_BACK_LEFT|CH_BACK_RIGHT)
-#define CH_LAYOUT_7POINT1_WIDE (CH_LAYOUT_SURROUND|CH_LOW_FREQUENCY|\
- CH_BACK_LEFT|CH_BACK_RIGHT|\
+#define CH_LAYOUT_7POINT1_WIDE (CH_LAYOUT_5POINT1_BACK|\
CH_FRONT_LEFT_OF_CENTER|CH_FRONT_RIGHT_OF_CENTER)
#define CH_LAYOUT_STEREO_DOWNMIX (CH_STEREO_LEFT|CH_STEREO_RIGHT)
@@ -431,6 +472,59 @@
AVDISCARD_ALL = 48, ///< discard all
};
+enum AVColorPrimaries{
+ AVCOL_PRI_BT709 =1, ///< also ITU-R BT1361 / IEC 61966-2-4 / SMPTE RP177 Annex B
+ AVCOL_PRI_UNSPECIFIED=2,
+ AVCOL_PRI_BT470M =4,
+ AVCOL_PRI_BT470BG =5, ///< also ITU-R BT601-6 625 / ITU-R BT1358 625 / ITU-R BT1700 625 PAL & SECAM
+ AVCOL_PRI_SMPTE170M =6, ///< also ITU-R BT601-6 525 / ITU-R BT1358 525 / ITU-R BT1700 NTSC
+ AVCOL_PRI_SMPTE240M =7, ///< functionally identical to above
+ AVCOL_PRI_FILM =8,
+ AVCOL_PRI_NB , ///< Not part of ABI
+};
+
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list