[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [61333] trunk/lib/win64/ffmpeg: Windows 64bit : Upgrade FFmpeg from 0.10 to 2.1.4
Sergey Sharybin
sergey.vfx at gmail.com
Thu Mar 27 12:07:37 CET 2014
Revision: 61333
https://developer.blender.org/rBL61333
Author: sergey
Date: 2014-03-27 11:07:37 +0000 (Thu, 27 Mar 2014)
Log Message:
-----------
Windows 64bit : Upgrade FFmpeg from 0.10 to 2.1.4
Modified Paths:
--------------
trunk/lib/win64/ffmpeg/Readme.txt
trunk/lib/win64/ffmpeg/include/libavcodec/avcodec.h
trunk/lib/win64/ffmpeg/include/libavcodec/avfft.h
trunk/lib/win64/ffmpeg/include/libavcodec/dxva2.h
trunk/lib/win64/ffmpeg/include/libavcodec/vaapi.h
trunk/lib/win64/ffmpeg/include/libavcodec/vda.h
trunk/lib/win64/ffmpeg/include/libavcodec/vdpau.h
trunk/lib/win64/ffmpeg/include/libavcodec/version.h
trunk/lib/win64/ffmpeg/include/libavcodec/xvmc.h
trunk/lib/win64/ffmpeg/include/libavdevice/avdevice.h
trunk/lib/win64/ffmpeg/include/libavformat/avformat.h
trunk/lib/win64/ffmpeg/include/libavformat/avio.h
trunk/lib/win64/ffmpeg/include/libavformat/version.h
trunk/lib/win64/ffmpeg/include/libavutil/adler32.h
trunk/lib/win64/ffmpeg/include/libavutil/aes.h
trunk/lib/win64/ffmpeg/include/libavutil/attributes.h
trunk/lib/win64/ffmpeg/include/libavutil/audioconvert.h
trunk/lib/win64/ffmpeg/include/libavutil/avassert.h
trunk/lib/win64/ffmpeg/include/libavutil/avconfig.h
trunk/lib/win64/ffmpeg/include/libavutil/avstring.h
trunk/lib/win64/ffmpeg/include/libavutil/avutil.h
trunk/lib/win64/ffmpeg/include/libavutil/base64.h
trunk/lib/win64/ffmpeg/include/libavutil/common.h
trunk/lib/win64/ffmpeg/include/libavutil/cpu.h
trunk/lib/win64/ffmpeg/include/libavutil/crc.h
trunk/lib/win64/ffmpeg/include/libavutil/dict.h
trunk/lib/win64/ffmpeg/include/libavutil/error.h
trunk/lib/win64/ffmpeg/include/libavutil/eval.h
trunk/lib/win64/ffmpeg/include/libavutil/fifo.h
trunk/lib/win64/ffmpeg/include/libavutil/file.h
trunk/lib/win64/ffmpeg/include/libavutil/imgutils.h
trunk/lib/win64/ffmpeg/include/libavutil/intreadwrite.h
trunk/lib/win64/ffmpeg/include/libavutil/lfg.h
trunk/lib/win64/ffmpeg/include/libavutil/log.h
trunk/lib/win64/ffmpeg/include/libavutil/lzo.h
trunk/lib/win64/ffmpeg/include/libavutil/mathematics.h
trunk/lib/win64/ffmpeg/include/libavutil/md5.h
trunk/lib/win64/ffmpeg/include/libavutil/mem.h
trunk/lib/win64/ffmpeg/include/libavutil/opt.h
trunk/lib/win64/ffmpeg/include/libavutil/parseutils.h
trunk/lib/win64/ffmpeg/include/libavutil/pixdesc.h
trunk/lib/win64/ffmpeg/include/libavutil/pixfmt.h
trunk/lib/win64/ffmpeg/include/libavutil/rational.h
trunk/lib/win64/ffmpeg/include/libavutil/samplefmt.h
trunk/lib/win64/ffmpeg/include/libavutil/sha.h
trunk/lib/win64/ffmpeg/include/libswscale/swscale.h
trunk/lib/win64/ffmpeg/lib/swscale-2.dll
trunk/lib/win64/ffmpeg/lib/swscale-2.lib
Added Paths:
-----------
trunk/lib/win64/ffmpeg/include/libavcodec/old_codec_ids.h
trunk/lib/win64/ffmpeg/include/libavdevice/version.h
trunk/lib/win64/ffmpeg/include/libavutil/audio_fifo.h
trunk/lib/win64/ffmpeg/include/libavutil/blowfish.h
trunk/lib/win64/ffmpeg/include/libavutil/bprint.h
trunk/lib/win64/ffmpeg/include/libavutil/buffer.h
trunk/lib/win64/ffmpeg/include/libavutil/channel_layout.h
trunk/lib/win64/ffmpeg/include/libavutil/frame.h
trunk/lib/win64/ffmpeg/include/libavutil/hmac.h
trunk/lib/win64/ffmpeg/include/libavutil/intfloat.h
trunk/lib/win64/ffmpeg/include/libavutil/murmur3.h
trunk/lib/win64/ffmpeg/include/libavutil/old_pix_fmts.h
trunk/lib/win64/ffmpeg/include/libavutil/ripemd.h
trunk/lib/win64/ffmpeg/include/libavutil/sha512.h
trunk/lib/win64/ffmpeg/include/libavutil/time.h
trunk/lib/win64/ffmpeg/include/libavutil/timecode.h
trunk/lib/win64/ffmpeg/include/libavutil/timestamp.h
trunk/lib/win64/ffmpeg/include/libavutil/version.h
trunk/lib/win64/ffmpeg/include/libavutil/xtea.h
trunk/lib/win64/ffmpeg/include/libswscale/version.h
trunk/lib/win64/ffmpeg/lib/avcodec-55.dll
trunk/lib/win64/ffmpeg/lib/avcodec-55.lib
trunk/lib/win64/ffmpeg/lib/avdevice-55.dll
trunk/lib/win64/ffmpeg/lib/avdevice-55.lib
trunk/lib/win64/ffmpeg/lib/avformat-55.dll
trunk/lib/win64/ffmpeg/lib/avformat-55.lib
trunk/lib/win64/ffmpeg/lib/avutil-52.dll
trunk/lib/win64/ffmpeg/lib/avutil-52.lib
Removed Paths:
-------------
trunk/lib/win64/ffmpeg/include/libavcodec/opt.h
trunk/lib/win64/ffmpeg/lib/avcodec-53.dll
trunk/lib/win64/ffmpeg/lib/avcodec-53.lib
trunk/lib/win64/ffmpeg/lib/avdevice-53.dll
trunk/lib/win64/ffmpeg/lib/avdevice-53.lib
trunk/lib/win64/ffmpeg/lib/avformat-53.dll
trunk/lib/win64/ffmpeg/lib/avformat-53.lib
trunk/lib/win64/ffmpeg/lib/avutil-51.dll
trunk/lib/win64/ffmpeg/lib/avutil-51.lib
Modified: trunk/lib/win64/ffmpeg/Readme.txt
===================================================================
--- trunk/lib/win64/ffmpeg/Readme.txt 2014-03-27 11:03:06 UTC (rev 61332)
+++ trunk/lib/win64/ffmpeg/Readme.txt 2014-03-27 11:07:37 UTC (rev 61333)
@@ -1,4 +1,4 @@
-This directory contains ffmpeg library v0.10 from http://www.ffmpeg.org/releases/ (January 31th, 2012)
+This directory contains ffmpeg library v2.1.4 from http://www.ffmpeg.org/releases/ (March 27th, 2014)
Compiled by Sergey Sharybin in msys environment
Quick notes
@@ -6,7 +6,7 @@
1. Compile ffmpeg libraries and copy include files and libs here
2. put stdint.h and inttypes.h in subfolder msvc to prevent conflicts with mingw
-3. add to libavutil\common.h after line 62
+3. add to libavutil\common.h after line 67
#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:
@@ -22,7 +22,7 @@
=========================
1. Used 64 bit mingw/msys environment: http://mingw-w64.sourceforge.net/
-2. Used gcc-4.4.7 due to some incompatibilities between used libraries and newer compilers
+2. Used gcc-4.7.4
3. Also used yasm: http://www.tortall.net/projects/yasm/wiki/Download
4. Used pthread library frmo mingw-w64 sourceforge files download page
@@ -33,9 +33,10 @@
--------------------
LIBS="/home/sergey/lib"
+VPX_VERSION="1.3.0"
./configure \
- --prefix=/home/sergey/lib/ffmpeg-0.10 \
+ --prefix=/home/sergey/lib/ffmpeg-2.1.4 \
--enable-shared \
--disable-static \
--disable-avfilter \
@@ -56,7 +57,6 @@
--enable-gpl \
--disable-postproc \
--disable-x11grab \
- --enable-libdirac \
--enable-libmp3lame \
--disable-librtmp \
--enable-libx264 \
@@ -67,13 +67,13 @@
--disable-version3 \
--disable-debug \
--enable-optimizations \
- --enable-ffplay \
--disable-sse \
--disable-ssse3 \
+ --enable-ffplay \
--enable-w32threads \
--disable-pthreads \
- --extra-cflags="-g -Wall -Wextra -I${LIBS}/lame/include -I${LIBS}/openjpeg/include -I${LIBS}/ogg/include -I${LIBS}/vorbis/include -I${LIBS}/theora/include -I${LIBS}/vpx/include -I${LIBS}/x264/include -I${LIBS}/xvid/include -I${LIBS}/dirac/include/dirac -I${LIBS}/schroedinger/include/schroedinger-1.0 -I${LIBS}/zlib/include" \
- --extra-ldflags="-Wl,--as-needed -static-libgcc -L${LIBS}/lame/lib -L${LIBS}/openjpeg/lib -L${LIBS}/ogg/lib -L${LIBS}/vorbis/lib -L${LIBS}/theora/lib -L${LIBS}/vpx/lib -L${LIBS}/x264/lib -L${LIBS}/xvid/lib -L${LIBS}/dirac/lib -L${LIBS}/schroedinger/lib -L${LIBS}/orc/lib -L${LIBS}/zlib/lib"
+ --extra-cflags="-g -Wall -Wextra -I${LIBS}/lame/include -I${LIBS}/openjpeg/include -I${LIBS}/ogg/include -I${LIBS}/vorbis/include -I${LIBS}/theora/include -I${LIBS}/vpx-${VPX_VERSION}/include -I${LIBS}/x264/include -I${LIBS}/xvid/include -I${LIBS}/dirac/include/dirac -I${LIBS}/schroedinger/include/schroedinger-1.0 -I${LIBS}/zlib/include" \
+ --extra-ldflags="-Wl,--as-needed -static-libgcc -L${LIBS}/lame/lib -L${LIBS}/openjpeg/lib -L${LIBS}/ogg/lib -L${LIBS}/vorbis/lib -L${LIBS}/theora/lib -L${LIBS}/vpx-${VPX_VERSION}/lib -L${LIBS}/x264/lib -L${LIBS}/xvid/lib -L${LIBS}/dirac/lib -L${LIBS}/schroedinger/lib -L${LIBS}/orc/lib -L${LIBS}/zlib/lib"
dirac configuration
-------------------
@@ -154,14 +154,21 @@
libvpx configuration
--------------------
-export CFLAGS="-g -Wall -Wextra"
-export LDFLAGS="-Wl,--as-needed -static-libgcc"
+#export CFLAGS="-g -Wall -Wextra"
+#export LDFLAGS="-Wl,--as-needed -static-libgcc"
./configure \
- --prefix=/home/sergey/lib/vpx \
+ --prefix=/home/sergey/lib/vpx-1.3.0 \
--disable-shared \
--disable-install-bins \
--disable-install-srcs \
+ --disable-sse4_1 \
+ --disable-sse3 \
+ --disable-ssse3 \
+ --disable-avx \
+ --disable-avx2 \
+ --disable-unit-tests \
+ --disable-examples \
--extra-cflags="-g -Wall -Wextra"
openjpeg configuration
Modified: trunk/lib/win64/ffmpeg/include/libavcodec/avcodec.h
===================================================================
--- trunk/lib/win64/ffmpeg/include/libavcodec/avcodec.h 2014-03-27 11:03:06 UTC (rev 61332)
+++ trunk/lib/win64/ffmpeg/include/libavcodec/avcodec.h 2014-03-27 11:07:37 UTC (rev 61333)
@@ -23,19 +23,25 @@
/**
* @file
- * external API header
+ * @ingroup libavc
+ * Libavcodec external API header
*/
#include <errno.h>
#include "libavutil/samplefmt.h"
+#include "libavutil/attributes.h"
#include "libavutil/avutil.h"
+#include "libavutil/buffer.h"
#include "libavutil/cpu.h"
+#include "libavutil/channel_layout.h"
#include "libavutil/dict.h"
+#include "libavutil/frame.h"
#include "libavutil/log.h"
#include "libavutil/pixfmt.h"
#include "libavutil/rational.h"
-#include "libavcodec/version.h"
+#include "version.h"
+
/**
* @defgroup libavc Encoding/Decoding Library
* @{
@@ -67,7 +73,16 @@
*
*/
+/**
+ * @defgroup lavc_core Core functions/structures.
+ * @ingroup libavc
+ *
+ * Basic definitions, functions for querying libavcodec capabilities,
+ * allocating core structures, etc.
+ * @{
+ */
+
/**
* Identify the syntax and semantics of the bitstream.
* The principle is roughly:
@@ -79,434 +94,483 @@
* If you add a codec ID to this list, add it so that
* 1. no value of a existing codec ID changes (that would break ABI),
* 2. Give it a value which when taken as ASCII is recognized uniquely by a human as this specific codec.
- * This ensures that 2 forks can independantly add CodecIDs without producing conflicts.
+ * This ensures that 2 forks can independently add AVCodecIDs without producing conflicts.
+ *
+ * After adding new codec IDs, do not forget to add an entry to the codec
+ * descriptor list and bump libavcodec minor version.
*/
-enum CodecID {
- CODEC_ID_NONE,
+enum AVCodecID {
+ AV_CODEC_ID_NONE,
/* video codecs */
- CODEC_ID_MPEG1VIDEO,
- CODEC_ID_MPEG2VIDEO, ///< preferred ID for MPEG-1/2 video decoding
- CODEC_ID_MPEG2VIDEO_XVMC,
- CODEC_ID_H261,
- CODEC_ID_H263,
- CODEC_ID_RV10,
- CODEC_ID_RV20,
- CODEC_ID_MJPEG,
- CODEC_ID_MJPEGB,
- CODEC_ID_LJPEG,
- CODEC_ID_SP5X,
- CODEC_ID_JPEGLS,
- CODEC_ID_MPEG4,
- CODEC_ID_RAWVIDEO,
- CODEC_ID_MSMPEG4V1,
- CODEC_ID_MSMPEG4V2,
- CODEC_ID_MSMPEG4V3,
- CODEC_ID_WMV1,
- CODEC_ID_WMV2,
- CODEC_ID_H263P,
- CODEC_ID_H263I,
- CODEC_ID_FLV1,
- CODEC_ID_SVQ1,
- CODEC_ID_SVQ3,
- CODEC_ID_DVVIDEO,
- CODEC_ID_HUFFYUV,
- CODEC_ID_CYUV,
- CODEC_ID_H264,
- CODEC_ID_INDEO3,
- CODEC_ID_VP3,
- CODEC_ID_THEORA,
- CODEC_ID_ASV1,
- CODEC_ID_ASV2,
- CODEC_ID_FFV1,
- CODEC_ID_4XM,
- CODEC_ID_VCR1,
- CODEC_ID_CLJR,
- CODEC_ID_MDEC,
- CODEC_ID_ROQ,
- CODEC_ID_INTERPLAY_VIDEO,
- CODEC_ID_XAN_WC3,
- CODEC_ID_XAN_WC4,
- CODEC_ID_RPZA,
- CODEC_ID_CINEPAK,
- CODEC_ID_WS_VQA,
- CODEC_ID_MSRLE,
- CODEC_ID_MSVIDEO1,
- CODEC_ID_IDCIN,
- CODEC_ID_8BPS,
- CODEC_ID_SMC,
- CODEC_ID_FLIC,
- CODEC_ID_TRUEMOTION1,
- CODEC_ID_VMDVIDEO,
- CODEC_ID_MSZH,
- CODEC_ID_ZLIB,
- CODEC_ID_QTRLE,
- CODEC_ID_SNOW,
- CODEC_ID_TSCC,
- CODEC_ID_ULTI,
- CODEC_ID_QDRAW,
- CODEC_ID_VIXL,
- CODEC_ID_QPEG,
- CODEC_ID_PNG,
- CODEC_ID_PPM,
- CODEC_ID_PBM,
- CODEC_ID_PGM,
- CODEC_ID_PGMYUV,
- CODEC_ID_PAM,
- CODEC_ID_FFVHUFF,
- CODEC_ID_RV30,
- CODEC_ID_RV40,
- CODEC_ID_VC1,
- CODEC_ID_WMV3,
- CODEC_ID_LOCO,
- CODEC_ID_WNV1,
- CODEC_ID_AASC,
- CODEC_ID_INDEO2,
- CODEC_ID_FRAPS,
- CODEC_ID_TRUEMOTION2,
- CODEC_ID_BMP,
- CODEC_ID_CSCD,
- CODEC_ID_MMVIDEO,
- CODEC_ID_ZMBV,
- CODEC_ID_AVS,
- CODEC_ID_SMACKVIDEO,
- CODEC_ID_NUV,
- CODEC_ID_KMVC,
- CODEC_ID_FLASHSV,
- CODEC_ID_CAVS,
- CODEC_ID_JPEG2000,
- CODEC_ID_VMNC,
- CODEC_ID_VP5,
- CODEC_ID_VP6,
- CODEC_ID_VP6F,
- CODEC_ID_TARGA,
- CODEC_ID_DSICINVIDEO,
- CODEC_ID_TIERTEXSEQVIDEO,
- CODEC_ID_TIFF,
- CODEC_ID_GIF,
-#if LIBAVCODEC_VERSION_MAJOR == 53
- CODEC_ID_FFH264,
-#endif
- CODEC_ID_DXA,
- CODEC_ID_DNXHD,
- CODEC_ID_THP,
- CODEC_ID_SGI,
- CODEC_ID_C93,
- CODEC_ID_BETHSOFTVID,
- CODEC_ID_PTX,
- CODEC_ID_TXD,
- CODEC_ID_VP6A,
- CODEC_ID_AMV,
- CODEC_ID_VB,
- CODEC_ID_PCX,
- CODEC_ID_SUNRAST,
- CODEC_ID_INDEO4,
- CODEC_ID_INDEO5,
- CODEC_ID_MIMIC,
- CODEC_ID_RL2,
-#if LIBAVCODEC_VERSION_MAJOR == 53
- CODEC_ID_8SVX_EXP,
- CODEC_ID_8SVX_FIB,
-#endif
- CODEC_ID_ESCAPE124,
- CODEC_ID_DIRAC,
- CODEC_ID_BFI,
- CODEC_ID_CMV,
- CODEC_ID_MOTIONPIXELS,
- 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,
- CODEC_ID_PICTOR,
- CODEC_ID_ANSI,
- CODEC_ID_A64_MULTI,
- CODEC_ID_A64_MULTI5,
- CODEC_ID_R10K,
- CODEC_ID_MXPEG,
- CODEC_ID_LAGARITH,
- CODEC_ID_PRORES,
- CODEC_ID_JV,
- CODEC_ID_DFA,
- CODEC_ID_WMV3IMAGE,
- CODEC_ID_VC1IMAGE,
-#if LIBAVCODEC_VERSION_MAJOR == 53
- CODEC_ID_G723_1_DEPRECATED,
- CODEC_ID_G729_DEPRECATED,
-#endif
- CODEC_ID_UTVIDEO_DEPRECATED,
- CODEC_ID_BMV_VIDEO,
- CODEC_ID_VBLE,
- CODEC_ID_DXTORY,
- CODEC_ID_V410,
- CODEC_ID_XWD,
- CODEC_ID_Y41P = MKBETAG('Y','4','1','P'),
- CODEC_ID_UTVIDEO = 0x800,
- CODEC_ID_ESCAPE130 = MKBETAG('E','1','3','0'),
- CODEC_ID_AVRP = MKBETAG('A','V','R','P'),
+ AV_CODEC_ID_MPEG1VIDEO,
+ AV_CODEC_ID_MPEG2VIDEO, ///< preferred ID for MPEG-1/2 video decoding
+ AV_CODEC_ID_MPEG2VIDEO_XVMC,
+ AV_CODEC_ID_H261,
+ AV_CODEC_ID_H263,
+ AV_CODEC_ID_RV10,
+ AV_CODEC_ID_RV20,
+ AV_CODEC_ID_MJPEG,
+ AV_CODEC_ID_MJPEGB,
+ AV_CODEC_ID_LJPEG,
+ AV_CODEC_ID_SP5X,
+ AV_CODEC_ID_JPEGLS,
+ AV_CODEC_ID_MPEG4,
+ AV_CODEC_ID_RAWVIDEO,
+ AV_CODEC_ID_MSMPEG4V1,
+ AV_CODEC_ID_MSMPEG4V2,
+ AV_CODEC_ID_MSMPEG4V3,
+ AV_CODEC_ID_WMV1,
+ AV_CODEC_ID_WMV2,
+ AV_CODEC_ID_H263P,
+ AV_CODEC_ID_H263I,
+ AV_CODEC_ID_FLV1,
+ AV_CODEC_ID_SVQ1,
+ AV_CODEC_ID_SVQ3,
+ AV_CODEC_ID_DVVIDEO,
+ AV_CODEC_ID_HUFFYUV,
+ AV_CODEC_ID_CYUV,
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list