[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [61336] trunk/lib/darwin-9.x.universal/ ffmpeg: OSX/FFmpeg: update to 2.1.4
jens verwiebe
info at jensverwiebe.de
Sat Mar 29 21:15:56 CET 2014
Revision: 61336
https://developer.blender.org/rBL61336
Author: jensverwiebe
Date: 2014-03-29 20:15:56 +0000 (Sat, 29 Mar 2014)
Log Message:
-----------
OSX/FFmpeg: update to 2.1.4
Modified Paths:
--------------
trunk/lib/darwin-9.x.universal/ffmpeg/include/libavcodec/avcodec.h
trunk/lib/darwin-9.x.universal/ffmpeg/include/libavcodec/avfft.h
trunk/lib/darwin-9.x.universal/ffmpeg/include/libavcodec/dxva2.h
trunk/lib/darwin-9.x.universal/ffmpeg/include/libavcodec/vaapi.h
trunk/lib/darwin-9.x.universal/ffmpeg/include/libavcodec/vda.h
trunk/lib/darwin-9.x.universal/ffmpeg/include/libavcodec/vdpau.h
trunk/lib/darwin-9.x.universal/ffmpeg/include/libavcodec/version.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/libavformat/version.h
trunk/lib/darwin-9.x.universal/ffmpeg/include/libavutil/adler32.h
trunk/lib/darwin-9.x.universal/ffmpeg/include/libavutil/aes.h
trunk/lib/darwin-9.x.universal/ffmpeg/include/libavutil/attributes.h
trunk/lib/darwin-9.x.universal/ffmpeg/include/libavutil/audioconvert.h
trunk/lib/darwin-9.x.universal/ffmpeg/include/libavutil/avassert.h
trunk/lib/darwin-9.x.universal/ffmpeg/include/libavutil/avconfig.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/cpu.h
trunk/lib/darwin-9.x.universal/ffmpeg/include/libavutil/crc.h
trunk/lib/darwin-9.x.universal/ffmpeg/include/libavutil/dict.h
trunk/lib/darwin-9.x.universal/ffmpeg/include/libavutil/error.h
trunk/lib/darwin-9.x.universal/ffmpeg/include/libavutil/eval.h
trunk/lib/darwin-9.x.universal/ffmpeg/include/libavutil/fifo.h
trunk/lib/darwin-9.x.universal/ffmpeg/include/libavutil/file.h
trunk/lib/darwin-9.x.universal/ffmpeg/include/libavutil/imgutils.h
trunk/lib/darwin-9.x.universal/ffmpeg/include/libavutil/intreadwrite.h
trunk/lib/darwin-9.x.universal/ffmpeg/include/libavutil/lfg.h
trunk/lib/darwin-9.x.universal/ffmpeg/include/libavutil/log.h
trunk/lib/darwin-9.x.universal/ffmpeg/include/libavutil/lzo.h
trunk/lib/darwin-9.x.universal/ffmpeg/include/libavutil/mathematics.h
trunk/lib/darwin-9.x.universal/ffmpeg/include/libavutil/md5.h
trunk/lib/darwin-9.x.universal/ffmpeg/include/libavutil/mem.h
trunk/lib/darwin-9.x.universal/ffmpeg/include/libavutil/opt.h
trunk/lib/darwin-9.x.universal/ffmpeg/include/libavutil/parseutils.h
trunk/lib/darwin-9.x.universal/ffmpeg/include/libavutil/pixdesc.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/samplefmt.h
trunk/lib/darwin-9.x.universal/ffmpeg/include/libavutil/sha.h
trunk/lib/darwin-9.x.universal/ffmpeg/include/libpostproc/postprocess.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/libpostproc.a
trunk/lib/darwin-9.x.universal/ffmpeg/lib/libswscale.a
trunk/lib/darwin-9.x.universal/ffmpeg/lib/libxvidcore.a
Added Paths:
-----------
trunk/lib/darwin-9.x.universal/ffmpeg/compiling_2.1.4.txt
trunk/lib/darwin-9.x.universal/ffmpeg/include/libavcodec/old_codec_ids.h
trunk/lib/darwin-9.x.universal/ffmpeg/include/libavdevice/version.h
trunk/lib/darwin-9.x.universal/ffmpeg/include/libavutil/audio_fifo.h
trunk/lib/darwin-9.x.universal/ffmpeg/include/libavutil/blowfish.h
trunk/lib/darwin-9.x.universal/ffmpeg/include/libavutil/bprint.h
trunk/lib/darwin-9.x.universal/ffmpeg/include/libavutil/buffer.h
trunk/lib/darwin-9.x.universal/ffmpeg/include/libavutil/channel_layout.h
trunk/lib/darwin-9.x.universal/ffmpeg/include/libavutil/frame.h
trunk/lib/darwin-9.x.universal/ffmpeg/include/libavutil/hmac.h
trunk/lib/darwin-9.x.universal/ffmpeg/include/libavutil/intfloat.h
trunk/lib/darwin-9.x.universal/ffmpeg/include/libavutil/murmur3.h
trunk/lib/darwin-9.x.universal/ffmpeg/include/libavutil/old_pix_fmts.h
trunk/lib/darwin-9.x.universal/ffmpeg/include/libavutil/ripemd.h
trunk/lib/darwin-9.x.universal/ffmpeg/include/libavutil/sha512.h
trunk/lib/darwin-9.x.universal/ffmpeg/include/libavutil/time.h
trunk/lib/darwin-9.x.universal/ffmpeg/include/libavutil/timecode.h
trunk/lib/darwin-9.x.universal/ffmpeg/include/libavutil/timestamp.h
trunk/lib/darwin-9.x.universal/ffmpeg/include/libavutil/version.h
trunk/lib/darwin-9.x.universal/ffmpeg/include/libavutil/xtea.h
trunk/lib/darwin-9.x.universal/ffmpeg/include/libpostproc/version.h
trunk/lib/darwin-9.x.universal/ffmpeg/include/libswresample/
trunk/lib/darwin-9.x.universal/ffmpeg/include/libswresample/swresample.h
trunk/lib/darwin-9.x.universal/ffmpeg/include/libswresample/version.h
trunk/lib/darwin-9.x.universal/ffmpeg/include/libswscale/version.h
Removed Paths:
-------------
trunk/lib/darwin-9.x.universal/ffmpeg/Compiling_0.10.rtf
trunk/lib/darwin-9.x.universal/ffmpeg/include/libavcodec/opt.h
Deleted: trunk/lib/darwin-9.x.universal/ffmpeg/Compiling_0.10.rtf
===================================================================
--- trunk/lib/darwin-9.x.universal/ffmpeg/Compiling_0.10.rtf 2014-03-27 12:22:08 UTC (rev 61335)
+++ trunk/lib/darwin-9.x.universal/ffmpeg/Compiling_0.10.rtf 2014-03-29 20:15:56 UTC (rev 61336)
@@ -1,63 +0,0 @@
-{\rtf1\ansi\ansicpg1252\cocoartf1038\cocoasubrtf360
-{\fonttbl\f0\fswiss\fcharset0 Helvetica;}
-{\colortbl;\red255\green255\blue255;}
-\paperw11900\paperh16840\margl1440\margr1440\vieww30780\viewh18720\viewkind0
-\pard\tx566\tx1133\tx1700\tx2267\tx2834\tx3401\tx3968\tx4535\tx5102\tx5669\tx6236\tx6803\ql\qnatural\pardirnatural
-
-\f0\b\fs30 \cf0 ffmpeg_0.8.1\
-\
-x86_64
-\b0 \
-./configure --prefix=/Volumes/Daten1TB/bf-blender/LIB_Sources/FFMPG_REDO/ffmpeg/ffmpeg-0.10_x86_64/Blender --cc=gcc-4.2 --arch=x86_64 --cpu=core2 --disable-shared --enable-gpl --enable-zlib --disable-ffserver --disable-ffplay --enable-swscale --disable-avfilter --disable-swresample --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/Volumes/Daten1TB/bf-blender/LIB_Sources/FFMPG_REDO/x264-snapshot-20120129-2245 -I/Volumes/Daten1TB/bf-blender/LIB_Sources/FFMPG_REDO/lame-3.98.4/Blender/include -I/Volumes/Daten1TB/bf-blender/LIB_Sources/FFMPG_REDO/xvidcore/src -I/Volumes/Daten1TB/bf-blender/LIB_Sources/FFMPG_REDO/libvorbis-1.3.2/include -I/Volumes/Daten1TB/bf-blender/LIB_Sources/FFMPG_REDO/libtheora-1.1.1/include -I/Volumes/Daten1TB/bf-blender/L
IB_Sources/FFMPG_REDO/libogg-1.2.1/include' --extra-ldflags='-arch x86_64 -isysroot /Developer/SDKs/MacOSX10.5.sdk -mmacosx-version-min=10.5 -L/Volumes/Daten1TB/bf-blender/lib/darwin-9.x.universal/ffmpeg_0.10/lib'\
-\
-
-\b i386
-\b0 \
-./configure --prefix=/Volumes/Daten1TB/bf-blender/LIB_Sources/FFMPG_REDO/ffmpeg/ffmpeg-0.10_i386/Blender --cc=gcc-4.2 --arch=i386 --cpu=core2 --disable-shared --enable-gpl --enable-zlib --disable-ffserver --disable-ffplay --enable-swscale --disable-avfilter --disable-swresample --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=core2 -isysroot /Developer/SDKs/MacOSX10.5.sdk -mmacosx-version-min=10.5 -I/Volumes/Daten1TB/bf-blender/LIB_Sources/FFMPG_REDO/x264-snapshot-20120129-2245 -I/Volumes/Daten1TB/bf-blender/LIB_Sources/FFMPG_REDO/lame-3.98.4/Blender/include -I/Volumes/Daten1TB/bf-blender/LIB_Sources/FFMPG_REDO/xvidcore/src -I/Volumes/Daten1TB/bf-blender/LIB_Sources/FFMPG_REDO/libvorbis-1.3.2/include -I/Volumes/Daten1TB/bf-blender/LIB_Sources/FFMPG_REDO/libtheora-1.1.1/include -I/Volumes/Daten1TB/bf-blender/LIB_Sou
rces/FFMPG_REDO/libogg-1.2.1/include' --extra-ldflags='-arch i386 -isysroot /Developer/SDKs/MacOSX10.5.sdk -mmacosx-version-min=10.5 -L/Volumes/Daten1TB/bf-blender/lib/darwin-9.x.universal/ffmpeg_0.10/lib'\
-\
-
-\b ppc
-\b0 \
-./configure --prefix=/Volumes/Daten1TB/bf-blender/LIB_Sources/FFMPG_REDO/ffmpeg/ffmpeg-0.10_ppc/Blender --cc=gcc-4.2 --arch=ppc --disable-shared --enable-gpl --enable-zlib --disable-ffserver --disable-ffplay --enable-swscale --disable-avfilter --disable-swresample --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 -isysroot /Developer/SDKs/MacOSX10.5.sdk -mmacosx-version-min=10.5 -I/Volumes/Daten1TB/bf-blender/LIB_Sources/FFMPG_REDO/x264-snapshot-20120129-2245 -I/Volumes/Daten1TB/bf-blender/LIB_Sources/FFMPG_REDO/lame-3.98.4/Blender/include -I/Volumes/Daten1TB/bf-blender/LIB_Sources/FFMPG_REDO/xvidcore/src -I/Volumes/Daten1TB/bf-blender/LIB_Sources/FFMPG_REDO/libvorbis-1.3.2/include -I/Volumes/Daten1TB/bf-blender/LIB_Sources/FFMPG_REDO/libtheora-1.1.1/include -I/Volumes/Daten1TB/bf-blender/LIB_Sources/FFMPG_REDO/libogg-1.2
.1/include' --extra-ldflags='-arch ppc -isysroot /Developer/SDKs/MacOSX10.5.sdk -mmacosx-version-min=10.5 -L/Volumes/Daten1TB/bf-blender/lib/darwin-9.x.universal/ffmpeg_0.10/lib'\
-\
-\
-\
-
-\b libx264 ( v116 ):
-\b0 \
-\
-
-\b x86_64
-\b0 \
-./configure --prefix=/Volumes/Daten250GB/bf-blender/LIB_Sources/x264-snapshot-20120129-2245 --extra-cflags="-O3 -msse2 -m64 -arch x86_64 -isysroot /Developer/SDKs/MacOSX10.5.sdk -mmacosx-version-min=10.5" --extra-ldflags="-m64 -arch x86_64" --disable-asm\
-\
-
-\b i386
-\b0 \
-./configure --prefix=/Volumes/Daten250GB/bf-blender/LIB_Sources/x264-snapshot-20120129-2245 --extra-cflags="-O3 -msse2 -m32 -arch i386 -isysroot /Developer/SDKs/MacOSX10.5.sdk -mmacosx-version-min=10.5" --extra-ldflags="-m32 -arch i386" --disable-asm\
-\
-
-\b ppc
-\b0 \
-./configure --prefix=/Volumes/Daten250GB/bf-blender/LIB_Sources/x264-snapshot-20120129-2245 --extra-cflags="-O3 -maltivec -m32 -arch ppc -isysroot /Developer/SDKs/MacOSX10.5.sdk -mmacosx-version-min=10.5" --extra-ldflags="-m32 -arch ppc" --disable-asm\
-\
-\
-\
-
-\b glue together:
-\b0 \
-\
-lipo -create /Volumes/Daten1TB/bf-blender/LIB_Sources/FFMPG_REDO/ffmpeg/ffmpeg-0.10_x86_64/Blender/lib/libavcodec.a /Volumes/Daten1TB/bf-blender/LIB_Sources/FFMPG_REDO/ffmpeg/ffmpeg-0.10_i386/Blender/lib/libavcodec.a /Volumes/Daten1TB/bf-blender/LIB_Sources/FFMPG_REDO/ffmpeg/ffmpeg-0.10_ppc/Blender/lib/libavcodec.a -output /Volumes/Daten1TB/bf-blender/LIB_Sources/FFMPG_REDO/ffmpeg/Blender/lib/libavcodec.a\
-\
-lipo -create /Volumes/Daten1TB/bf-blender/LIB_Sources/FFMPG_REDO/ffmpeg/ffmpeg-0.10_x86_64/Blender/lib/libavdevice.a /Volumes/Daten1TB/bf-blender/LIB_Sources/FFMPG_REDO/ffmpeg/ffmpeg-0.10_i386/Blender/lib/libavdevice.a /Volumes/Daten1TB/bf-blender/LIB_Sources/FFMPG_REDO/ffmpeg/ffmpeg-0.10_ppc/Blender/lib/libavdevice.a -output /Volumes/Daten1TB/bf-blender/LIB_Sources/FFMPG_REDO/ffmpeg/Blender/lib/libavdevice.a\
-\
-lipo -create /Volumes/Daten1TB/bf-blender/LIB_Sources/FFMPG_REDO/ffmpeg/ffmpeg-0.10_x86_64/Blender/lib/libavformat.a /Volumes/Daten1TB/bf-blender/LIB_Sources/FFMPG_REDO/ffmpeg/ffmpeg-0.10_i386/Blender/lib/libavformat.a /Volumes/Daten1TB/bf-blender/LIB_Sources/FFMPG_REDO/ffmpeg/ffmpeg-0.10_ppc/Blender/lib/libavformat.a -output /Volumes/Daten1TB/bf-blender/LIB_Sources/FFMPG_REDO/ffmpeg/Blender/lib/libavformat.a\
-\
-lipo -create /Volumes/Daten1TB/bf-blender/LIB_Sources/FFMPG_REDO/ffmpeg/ffmpeg-0.10_x86_64/Blender/lib/libavutil.a /Volumes/Daten1TB/bf-blender/LIB_Sources/FFMPG_REDO/ffmpeg/ffmpeg-0.10_i386/Blender/lib/libavutil.a /Volumes/Daten1TB/bf-blender/LIB_Sources/FFMPG_REDO/ffmpeg/ffmpeg-0.10_ppc/Blender/lib/libavutil.a -output /Volumes/Daten1TB/bf-blender/LIB_Sources/FFMPG_REDO/ffmpeg/Blender/lib/libavutil.a\
-\
-lipo -create /Volumes/Daten1TB/bf-blender/LIB_Sources/FFMPG_REDO/ffmpeg/ffmpeg-0.10_x86_64/Blender/lib/libpostproc.a /Volumes/Daten1TB/bf-blender/LIB_Sources/FFMPG_REDO/ffmpeg/ffmpeg-0.10_i386/Blender/lib/libpostproc.a /Volumes/Daten1TB/bf-blender/LIB_Sources/FFMPG_REDO/ffmpeg/ffmpeg-0.10_ppc/Blender/lib/libpostproc.a -output /Volumes/Daten1TB/bf-blender/LIB_Sources/FFMPG_REDO/ffmpeg/Blender/lib/libpostproc.a\
-\
-lipo -create /Volumes/Daten1TB/bf-blender/LIB_Sources/FFMPG_REDO/ffmpeg/ffmpeg-0.10_x86_64/Blender/lib/libswscale.a /Volumes/Daten1TB/bf-blender/LIB_Sources/FFMPG_REDO/ffmpeg/ffmpeg-0.10_i386/Blender/lib/libswscale.a /Volumes/Daten1TB/bf-blender/LIB_Sources/FFMPG_REDO/ffmpeg/ffmpeg-0.10_ppc/Blender/lib/libswscale.a -output /Volumes/Daten1TB/bf-blender/LIB_Sources/FFMPG_REDO/ffmpeg/Blender/lib/libswscale.a\
-\
-\
-}
\ No newline at end of file
Added: trunk/lib/darwin-9.x.universal/ffmpeg/compiling_2.1.4.txt
===================================================================
--- trunk/lib/darwin-9.x.universal/ffmpeg/compiling_2.1.4.txt (rev 0)
+++ trunk/lib/darwin-9.x.universal/ffmpeg/compiling_2.1.4.txt 2014-03-29 20:15:56 UTC (rev 61336)
@@ -0,0 +1,7 @@
+
+
+x86_64
+./configure --prefix=/Volumes/Workdata/Blender/LIB_Sources/FFMPG_REDO/ffmpeg-2.1.4_x86_64/Blender --disable-yasm --arch=x86_64 --disable-shared --enable-gpl --enable-zlib --disable-ffserver --disable-ffplay --enable-swscale --disable-avfilter --enable-encoder=prores --enable-encoder=yuv4 --enable-encoder=v410 --enable-encoder=v308 --enable-encoder=210 --enable-decoder=prores --enable-decoder=yuv4 --enable-decoder=v410 --enable-decoder=v308 --enable-decoder=210 --enable-memalign-hack --enable-pthreads --disable-outdevs --disable-demuxer=alsa --enable-libmp3lame --enable-libx264 --enable-libxvid --enable-libtheora --enable-libvorbis --extra-cflags='-stdlib=libstdc++ -O3 -arch x86_64 -mmacosx-version-min=10.6 -I/Volumes/Workdata/Blender/LIB_Sources/FFMPG_REDO/x264-snapshot-20120129-2245 -I/Volumes/Workdata/Blender/LIB_Sources/FFMPG_REDO/lame-3.98.4/Blender/include -I/Volumes/Workdata/Blender/LIB_Sources/FFMPG_REDO/xvidcore/src -I/Volumes/Workdata/Blender/LIB_Sources/F
FMPG_REDO/libvorbis-1.3.2/include -I/Volumes/Workdata/Blender/LIB_Sources/FFMPG_REDO/libtheora-1.1.1/include -I/Volumes/Workdata/Blender/LIB_Sources/FFMPG_REDO/libogg-1.2.1/include' --extra-ldflags='-arch x86_64 -mmacosx-version-min=10.6 -L/Volumes/Workdata/Blender/Development/lib/darwin-9.x.universal/ffmpeg/lib'
+
+i386
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list