[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [22733] trunk/lib/windows/ffmpeg: * update FFMPEG libs to r29545.
Nathan Letwory
jesterking at letwory.net
Mon Aug 24 04:46:15 CEST 2009
Revision: 22733
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=22733
Author: jesterking
Date: 2009-08-24 04:46:13 +0200 (Mon, 24 Aug 2009)
Log Message:
-----------
* update FFMPEG libs to r29545. Commits in trunk and b25 branch follow shortly
Modified Paths:
--------------
trunk/lib/windows/ffmpeg/Readme.txt
trunk/lib/windows/ffmpeg/include/libavcodec/avcodec.h
trunk/lib/windows/ffmpeg/include/libavcodec/opt.h
trunk/lib/windows/ffmpeg/include/libavcodec/xvmc.h
trunk/lib/windows/ffmpeg/include/libavdevice/avdevice.h
trunk/lib/windows/ffmpeg/include/libavformat/avformat.h
trunk/lib/windows/ffmpeg/include/libavformat/avio.h
trunk/lib/windows/ffmpeg/include/libavutil/avutil.h
trunk/lib/windows/ffmpeg/include/libavutil/base64.h
trunk/lib/windows/ffmpeg/include/libavutil/common.h
trunk/lib/windows/ffmpeg/include/libavutil/crc.h
trunk/lib/windows/ffmpeg/include/libavutil/fifo.h
trunk/lib/windows/ffmpeg/include/libavutil/intfloat_readwrite.h
trunk/lib/windows/ffmpeg/include/libavutil/log.h
trunk/lib/windows/ffmpeg/include/libavutil/lzo.h
trunk/lib/windows/ffmpeg/include/libavutil/mathematics.h
trunk/lib/windows/ffmpeg/include/libavutil/mem.h
trunk/lib/windows/ffmpeg/include/libavutil/pixfmt.h
trunk/lib/windows/ffmpeg/include/libavutil/rational.h
trunk/lib/windows/ffmpeg/include/libavutil/sha1.h
trunk/lib/windows/ffmpeg/include/libswscale/swscale.h
trunk/lib/windows/ffmpeg/lib/avcodec-52.dll
trunk/lib/windows/ffmpeg/lib/avcodec-52.lib
trunk/lib/windows/ffmpeg/lib/avdevice-52.dll
trunk/lib/windows/ffmpeg/lib/avdevice-52.lib
trunk/lib/windows/ffmpeg/lib/avformat-52.dll
trunk/lib/windows/ffmpeg/lib/avformat-52.lib
trunk/lib/windows/ffmpeg/lib/avutil-50.dll
trunk/lib/windows/ffmpeg/lib/avutil-50.lib
trunk/lib/windows/ffmpeg/lib/swscale-0.dll
trunk/lib/windows/ffmpeg/lib/swscale-0.lib
Added Paths:
-----------
trunk/lib/windows/ffmpeg/include/changelog.txt
trunk/lib/windows/ffmpeg/include/msvc/
trunk/lib/windows/ffmpeg/include/msvc/inttypes.h
trunk/lib/windows/ffmpeg/include/msvc/stdint.h
Removed Paths:
-------------
trunk/lib/windows/ffmpeg/include/inttypes.h
trunk/lib/windows/ffmpeg/include/libavformat/rtsp.h
trunk/lib/windows/ffmpeg/include/libavformat/rtspcodes.h
trunk/lib/windows/ffmpeg/include/libavutil/random.h
trunk/lib/windows/ffmpeg/include/libswscale/rgb2rgb.h
trunk/lib/windows/ffmpeg/include/stdint.h
Modified: trunk/lib/windows/ffmpeg/Readme.txt
===================================================================
--- trunk/lib/windows/ffmpeg/Readme.txt 2009-08-24 00:01:09 UTC (rev 22732)
+++ trunk/lib/windows/ffmpeg/Readme.txt 2009-08-24 02:46:13 UTC (rev 22733)
@@ -1,29 +1,14 @@
-This directory contains the Revision 12758 shared binaries for use with Blender.
+This directory contains r29545 from http://ffmpeg.arrozcru.org/autobuilds/
-The compilation has been done according to the instruction in this wiki:
+See http://ffmpeg.arrozcru.org/autobuilds/logs/2009-08-23-OK for build log
-http://ffmpeg.arrozcru.org/wiki/
+Some quick mods:
-With the following options:
-
- external libs:
- mp3lame, xvidcore, faad, faac, x264
-
- ffmpeg source:
- After getting revision from svn, apply the patch from Peter Schaile: ffmpeg_accel_bgra32.patch
-
- Compilation option for ffmpeg:
- --enable-shared --disable-static --enable-memalign-hack --extra-ldflags=-L/shared/lib --extra-cflags=-I/shared/include --enable-libmp3lame --enable-libfaac --enable-libfaad --enable-libx264 --enable-gpl --enable-libxvid --disable-ffplay --disable-ffserver --enable-zlib
-
-The compilation returns error on linking the ffmpeg applications but the DLL are correctly built.
-Copy the ffmpeg dll an lib files from <mingw>/local/bin directory to <blender_home>/lib/windows/ffmpeg/lib.
-Rename the dll and lib so that they match the format <lib_name>-<version>.<ext>.
-Copy the ffmpeg headers from <mingw>/local/include to <blender_home>/lib/windows/ffmpeg/include
-
-The includes files have been modified to compile with MSVC as follows:
-1. Replace every occurance of "static inline" with "__inline"
-2. copy the stdint.h and inttypes.h from <mingw>/include directory to <blender_home>/lib/windows/ffmpeg/include directory
-3. Optionally add #ifndef statements in inttypes.h to avoid conflict with same file from QUickTime compatibility module.
+1. rename the .lib files according to .dll naming (include version number)
+2. put stdint.h and inttypes.h in subfolder msvc to prevent conflicts with mingw
+3. add to libavutil\common.h after line 133
+ #define FFALIGN(x, a) (((x)+(a)-1)&~((a)-1)
+ #define inline __inline
4. modify stdint.h to make it compatible with MSVC C++ headers:
Add signed to int8_t, int16_t, int32_t, int64_t:
typedef signed __int8 int8_t;
@@ -31,21 +16,7 @@
typedef signed __int32 int32_t;
typedef signed __int64 int64_t;
-protect intptr_t and uintptr_t with #if statements:
- #ifndef _INTPTR_T_DEFINED
- #ifdef _WIN64
- typedef __int64 intptr_t;
- #else // _WIN64
- typedef long intptr_t;
- #endif // _WIN64
- #define _INTPTR_T_DEFINED
- #endif
+Known issues:
+* importing DV files may crash if there are bad blocks
+* AC3 may crash
- #ifndef _UINTPTR_T_DEFINED
- #ifdef _WIN64
- typedef unsigned __int64 uintptr_t;
- #else // _WIN64
- typedef unsigned long uintptr_t;
- #endif // _WIN64
- #define _UINTPTR_T_DEFINED
- #endif
Added: trunk/lib/windows/ffmpeg/include/changelog.txt
===================================================================
--- trunk/lib/windows/ffmpeg/include/changelog.txt (rev 0)
+++ trunk/lib/windows/ffmpeg/include/changelog.txt 2009-08-24 02:46:13 UTC (rev 22733)
@@ -0,0 +1,111 @@
+------------------------------------------------------------------------
+r21 | 2008-07-17 09:47:22 +0400 | 4 lines
+
+Get rid of these compiler warnings when compiling for 32-bit:
+ warning C4311: 'type cast' : pointer truncation from 'void *' to 'uintptr_t'
+ warning C4312: 'type cast' : conversion from 'uintptr_t' to 'const void *' of greater size
+
+------------------------------------------------------------------------
+r20 | 2007-10-09 16:54:27 +0400 | 2 lines
+
+Better C99 conformance: macros for format specifiers should only be included in C++ implementations if __STDC_FORMAT_MACROS is defined before <inttypes.h> is included.
+
+------------------------------------------------------------------------
+r19 | 2007-07-04 02:14:40 +0400 | 3 lines
+
+Explicitly cast to appropriate type INT8_MIN, INT16_MIN, INT32_MIN and INT64_MIN constants.
+Due to their unusual definition in Visual Studio headers (-_Ix_MAX-1) they are propagated to int and thus do not have expected type, causing VS6 strict compiler to claim about type inconsistency.
+
+------------------------------------------------------------------------
+r18 | 2007-06-26 16:53:23 +0400 | 2 lines
+
+Better handling of (U)INTx_C macros - now they generate constants of exact width.
+
+------------------------------------------------------------------------
+r17 | 2007-03-29 20:16:14 +0400 | 2 lines
+
+Fix typo: Miscrosoft -> Microsoft.
+
+------------------------------------------------------------------------
+r16 | 2007-02-24 17:32:58 +0300 | 4 lines
+
+Remove <BaseTsd.h> include, as it is not present in Visual Studio 2005 Epxress Edition and required only for INT_PTR and UINT_PTR types.
+
+'intptr_t' and 'uintptr_t' types now defined explicitly with #ifdef _WIN64.
+
+------------------------------------------------------------------------
+r15 | 2007-02-11 20:53:05 +0300 | 2 lines
+
+More correct fix for compilation under VS6.
+
+------------------------------------------------------------------------
+r14 | 2007-02-11 20:04:32 +0300 | 2 lines
+
+Bugfix: fix compiling under VS6, when stdint.h enclosed in 'extern "C" {}'.
+
+------------------------------------------------------------------------
+r13 | 2006-12-13 16:53:11 +0300 | 2 lines
+
+Make _inline modifier for imaxdiv default option. Use STATIC_IMAXDIV to make it static.
+
+------------------------------------------------------------------------
+r12 | 2006-12-13 16:42:24 +0300 | 2 lines
+
+Error message changed: VC6 supported from now.
+
+------------------------------------------------------------------------
+r11 | 2006-12-13 16:39:33 +0300 | 2 lines
+
+All (U)INT* types changed to (unsigned) __int*. This should make stdint.h compatible with VC6.
+
+------------------------------------------------------------------------
+r10 | 2006-12-13 16:20:57 +0300 | 3 lines
+
+Added INLINE_IMAXDIV define switch.
+If INLINE_IMAXDIV is defined imaxdiv() have static modifier. If not - it is _inline.
+
+------------------------------------------------------------------------
+r9 | 2006-12-13 15:53:52 +0300 | 2 lines
+
+Error message for non-MSC compiler changed.
+
+------------------------------------------------------------------------
+r8 | 2006-12-13 12:47:48 +0300 | 2 lines
+
+Added #ifndef for SIZE_MAX (it is defined in limits.h on MSVSC 8).
+
+------------------------------------------------------------------------
+r7 | 2006-12-13 01:08:02 +0300 | 2 lines
+
+License chaged to BSD-derivative.
+
+------------------------------------------------------------------------
+r6 | 2006-12-13 00:53:20 +0300 | 2 lines
+
+Added <wchar.h> include to avoid warnings when it is included after stdint.h.
+
+------------------------------------------------------------------------
+r5 | 2006-12-12 00:58:05 +0300 | 2 lines
+
+BUGFIX: Definitions of INTPTR_MIN, INTPTR_MAX and UINTPTR_MAX for WIN32 and WIN64 was mixed up.
+
+------------------------------------------------------------------------
+r4 | 2006-12-12 00:51:55 +0300 | 2 lines
+
+Rise #error if _MSC_VER is not defined. I.e. compiler other then Microsoft Visual C++ is used.
+
+------------------------------------------------------------------------
+r3 | 2006-12-11 22:54:14 +0300 | 2 lines
+
+Added <limits.h> include to stdint.h.
+
+------------------------------------------------------------------------
+r2 | 2006-12-11 21:39:27 +0300 | 2 lines
+
+Initial check in.
+
+------------------------------------------------------------------------
+r1 | 2006-12-11 21:30:23 +0300 | 1 line
+
+Initial directory structure.
+------------------------------------------------------------------------
Deleted: trunk/lib/windows/ffmpeg/include/inttypes.h
===================================================================
--- trunk/lib/windows/ffmpeg/include/inttypes.h 2009-08-24 00:01:09 UTC (rev 22732)
+++ trunk/lib/windows/ffmpeg/include/inttypes.h 2009-08-24 02:46:13 UTC (rev 22733)
@@ -1,305 +0,0 @@
-// ISO C9x compliant inttypes.h for Microsoft Visual Studio
-// Based on ISO/IEC 9899:TC2 Committee draft (May 6, 2005) WG14/N1124
-//
-// Copyright (c) 2006 Alexander Chemeris
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// 1. Redistributions of source code must retain the above copyright notice,
-// this list of conditions and the following disclaimer.
-//
-// 2. Redistributions in binary form must reproduce the above copyright
-// notice, this list of conditions and the following disclaimer in the
-// documentation and/or other materials provided with the distribution.
-//
-// 3. The name of the author may be used to endorse or promote products
-// derived from this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
-// WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-// MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
-// EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-// PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-// OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-// WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-// OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-// ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-//
-///////////////////////////////////////////////////////////////////////////////
-
-#ifndef _MSC_VER // [
-#error "Use this header only with Microsoft Visual C++ compilers!"
-#endif // _MSC_VER ]
-
-#ifndef _MSC_INTTYPES_H_ // [
-#define _MSC_INTTYPES_H_
-
-#if _MSC_VER > 1000
-#pragma once
-#endif
-
-#include <stdint.h>
-
-// 7.8 Format conversion of integer types
-
-typedef struct {
- intmax_t quot;
- intmax_t rem;
-} imaxdiv_t;
-
-// 7.8.1 Macros for format specifiers
-
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list