[Bf-blender-cvs] SVN commit: /data/svn/repos/bf-blender [61380] trunk/lib/ darwin-9.x.universal/ffmpeg: ffmpeg/OSX: update to v 2.1.5 and revert to former agreed flags again

[jens verwiebe]

Revision: 61380
          https://developer.blender.org/rBL61380
Author:   jensverwiebe
Date:     2014-07-23 16:52:34 +0000 (Wed, 23 Jul 2014)
Log Message:
-----------
ffmpeg/OSX: update to v 2.1.5 and revert to former agreed flags again

Modified Paths:
--------------
    trunk/lib/darwin-9.x.universal/ffmpeg/include/libavutil/timestamp.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

Added Paths:
-----------
    trunk/lib/darwin-9.x.universal/ffmpeg/compiling_2.1.5.txt

Removed Paths:
-------------
    trunk/lib/darwin-9.x.universal/ffmpeg/compiling_2.1.4.txt

Deleted: trunk/lib/darwin-9.x.universal/ffmpeg/compiling_2.1.4.txt
===================================================================
--- trunk/lib/darwin-9.x.universal/ffmpeg/compiling_2.1.4.txt	2014-07-23 14:14:56 UTC (rev 61379)
+++ trunk/lib/darwin-9.x.universal/ffmpeg/compiling_2.1.4.txt	2014-07-23 16:52:34 UTC (rev 61380)
@@ -1,7 +0,0 @@
-
-
-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-network --enable-protocol=tcp --enable-demuxer=rtsp --enable-decoder=h264 --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/LI
 B_Sources/FFMPG_REDO/xvidcore/src -I/Volumes/Workdata/Blender/LIB_Sources/FFMPG_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
-./configure --prefix=/Volumes/Workdata/Blender/LIB_Sources/FFMPG_REDO/ffmpeg-2.1.4_i386/Blender --disable-yasm --arch=i386 --disable-shared --enable-gpl --enable-network --enable-protocol=tcp --enable-demuxer=rtsp --enable-decoder=h264 --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 i386 -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_Sour
 ces/FFMPG_REDO/xvidcore/src -I/Volumes/Workdata/Blender/LIB_Sources/FFMPG_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 i386 -mmacosx-version-min=10.6  -L/Volumes/Workdata/Blender/Development/lib/darwin-9.x.universal/ffmpeg/lib'

Added: trunk/lib/darwin-9.x.universal/ffmpeg/compiling_2.1.5.txt
===================================================================
--- trunk/lib/darwin-9.x.universal/ffmpeg/compiling_2.1.5.txt	                        (rev 0)
+++ trunk/lib/darwin-9.x.universal/ffmpeg/compiling_2.1.5.txt	2014-07-23 16:52:34 UTC (rev 61380)
@@ -0,0 +1,7 @@
+
+
+x86_64
+./configure --prefix=/Volumes/Workdata/Blender/LIB_Sources/FFMPG_REDO/ffmpeg-2.1.5_x86_64/Blender --disable-yasm --arch=x86_64 --disable-shared --enable-gpl --enable-network --enable-decoder=h264 --enable-zlib --disable-ffserver --disable-ffplay --enable-swscale --disable-avfilter --enable-encoder=prores  --enable-encoder=yuv4   --enable-encoder=v410  --enable-encoder=v308   --enable-decoder=prores  --enable-decoder=yuv4   --enable-decoder=v410 --enable-decoder=v308   --enable-memalign-hack --enable-pthreads --disable-outdevs  --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/FFMPG_REDO/libvorbis-1.3.2/includ
 e -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
+./configure --prefix=/Volumes/Workdata/Blender/LIB_Sources/FFMPG_REDO/ffmpeg-2.1.5_i386/Blender --disable-yasm --arch=i386 --disable-shared --enable-gpl --enable-network --enable-zlib --disable-ffserver --disable-ffplay --enable-swscale --disable-avfilter --enable-encoder=prores  --enable-encoder=yuv4   --enable-encoder=v410  --enable-encoder=v308  --enable-decoder=prores  --enable-decoder=yuv4   --enable-decoder=v410  --enable-decoder=v308   --enable-memalign-hack --enable-pthreads --disable-outdevs  --enable-libmp3lame --enable-libx264 --enable-libxvid --enable-libtheora --enable-libvorbis --extra-cflags='-stdlib=libstdc++ -O3 -arch i386 -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/FFMPG_REDO/libvorbis-1.3.2/include -I/Volumes/Workdata/Blende
 r/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 i386 -mmacosx-version-min=10.6  -L/Volumes/Workdata/Blender/Development/lib/darwin-9.x.universal/ffmpeg/lib'

Modified: trunk/lib/darwin-9.x.universal/ffmpeg/include/libavutil/timestamp.h
===================================================================
--- trunk/lib/darwin-9.x.universal/ffmpeg/include/libavutil/timestamp.h	2014-07-23 14:14:56 UTC (rev 61379)
+++ trunk/lib/darwin-9.x.universal/ffmpeg/include/libavutil/timestamp.h	2014-07-23 16:52:34 UTC (rev 61380)
@@ -26,6 +26,10 @@
 
 #include "common.h"
 
+#if defined(__cplusplus) && !defined(__STDC_FORMAT_MACROS) && !defined(PRId64)
+#error missing -D__STDC_FORMAT_MACROS / #define __STDC_FORMAT_MACROS
+#endif
+
 #define AV_TS_MAX_STRING_SIZE 32
 
 /**

Modified: trunk/lib/darwin-9.x.universal/ffmpeg/lib/libavcodec.a
===================================================================
(Binary files differ)

Modified: trunk/lib/darwin-9.x.universal/ffmpeg/lib/libavdevice.a
===================================================================
(Binary files differ)

Modified: trunk/lib/darwin-9.x.universal/ffmpeg/lib/libavformat.a
===================================================================
(Binary files differ)

Modified: trunk/lib/darwin-9.x.universal/ffmpeg/lib/libavutil.a
===================================================================
(Binary files differ)

Modified: trunk/lib/darwin-9.x.universal/ffmpeg/lib/libpostproc.a
===================================================================
(Binary files differ)

Modified: trunk/lib/darwin-9.x.universal/ffmpeg/lib/libswscale.a
===================================================================
(Binary files differ)