[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [61250] trunk/lib/win64_vc11: VS 2012 libs update:

Juergen Herrmann shadowrom at me.com
Tue Dec 17 11:22:44 CET 2013


Revision: 61250
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=61250
Author:   shadowrom
Date:     2013-12-17 10:22:43 +0000 (Tue, 17 Dec 2013)
Log Message:
-----------
VS 2012 libs update:
- Upgraded to FFmpeg 2.11
- Downgraded libpng to 1.5.17 to aoid warnings on blender startup
- Upgraded to Python 3.3.3 with new release package (fies some missing files)

Modified Paths:
--------------
    trunk/lib/win64_vc11/ffmpeg/include/libavcodec/avcodec.h
    trunk/lib/win64_vc11/ffmpeg/include/libavcodec/old_codec_ids.h
    trunk/lib/win64_vc11/ffmpeg/include/libavcodec/vda.h
    trunk/lib/win64_vc11/ffmpeg/include/libavcodec/vdpau.h
    trunk/lib/win64_vc11/ffmpeg/include/libavcodec/version.h
    trunk/lib/win64_vc11/ffmpeg/include/libavdevice/version.h
    trunk/lib/win64_vc11/ffmpeg/include/libavfilter/avcodec.h
    trunk/lib/win64_vc11/ffmpeg/include/libavfilter/avfilter.h
    trunk/lib/win64_vc11/ffmpeg/include/libavfilter/avfiltergraph.h
    trunk/lib/win64_vc11/ffmpeg/include/libavfilter/buffersink.h
    trunk/lib/win64_vc11/ffmpeg/include/libavfilter/buffersrc.h
    trunk/lib/win64_vc11/ffmpeg/include/libavfilter/version.h
    trunk/lib/win64_vc11/ffmpeg/include/libavformat/avformat.h
    trunk/lib/win64_vc11/ffmpeg/include/libavformat/avio.h
    trunk/lib/win64_vc11/ffmpeg/include/libavformat/version.h
    trunk/lib/win64_vc11/ffmpeg/include/libavutil/adler32.h
    trunk/lib/win64_vc11/ffmpeg/include/libavutil/attributes.h
    trunk/lib/win64_vc11/ffmpeg/include/libavutil/audio_fifo.h
    trunk/lib/win64_vc11/ffmpeg/include/libavutil/avconfig.h
    trunk/lib/win64_vc11/ffmpeg/include/libavutil/avstring.h
    trunk/lib/win64_vc11/ffmpeg/include/libavutil/avutil.h
    trunk/lib/win64_vc11/ffmpeg/include/libavutil/bprint.h
    trunk/lib/win64_vc11/ffmpeg/include/libavutil/channel_layout.h
    trunk/lib/win64_vc11/ffmpeg/include/libavutil/common.h
    trunk/lib/win64_vc11/ffmpeg/include/libavutil/cpu.h
    trunk/lib/win64_vc11/ffmpeg/include/libavutil/crc.h
    trunk/lib/win64_vc11/ffmpeg/include/libavutil/error.h
    trunk/lib/win64_vc11/ffmpeg/include/libavutil/eval.h
    trunk/lib/win64_vc11/ffmpeg/include/libavutil/file.h
    trunk/lib/win64_vc11/ffmpeg/include/libavutil/hmac.h
    trunk/lib/win64_vc11/ffmpeg/include/libavutil/intfloat.h
    trunk/lib/win64_vc11/ffmpeg/include/libavutil/log.h
    trunk/lib/win64_vc11/ffmpeg/include/libavutil/md5.h
    trunk/lib/win64_vc11/ffmpeg/include/libavutil/mem.h
    trunk/lib/win64_vc11/ffmpeg/include/libavutil/old_pix_fmts.h
    trunk/lib/win64_vc11/ffmpeg/include/libavutil/opt.h
    trunk/lib/win64_vc11/ffmpeg/include/libavutil/parseutils.h
    trunk/lib/win64_vc11/ffmpeg/include/libavutil/pixdesc.h
    trunk/lib/win64_vc11/ffmpeg/include/libavutil/pixfmt.h
    trunk/lib/win64_vc11/ffmpeg/include/libavutil/rational.h
    trunk/lib/win64_vc11/ffmpeg/include/libavutil/samplefmt.h
    trunk/lib/win64_vc11/ffmpeg/include/libavutil/timestamp.h
    trunk/lib/win64_vc11/ffmpeg/include/libavutil/version.h
    trunk/lib/win64_vc11/ffmpeg/include/libswresample/swresample.h
    trunk/lib/win64_vc11/ffmpeg/include/libswresample/version.h
    trunk/lib/win64_vc11/ffmpeg/include/libswscale/swscale.h
    trunk/lib/win64_vc11/ffmpeg/include/libswscale/version.h
    trunk/lib/win64_vc11/ffmpeg/include/msvc/inttypes.h
    trunk/lib/win64_vc11/ffmpeg/include/msvc/stdint.h
    trunk/lib/win64_vc11/ffmpeg/lib/avfilter-3.def
    trunk/lib/win64_vc11/ffmpeg/lib/avfilter-3.dll
    trunk/lib/win64_vc11/ffmpeg/lib/avfilter-3.lib
    trunk/lib/win64_vc11/ffmpeg/lib/avutil-52.def
    trunk/lib/win64_vc11/ffmpeg/lib/avutil-52.dll
    trunk/lib/win64_vc11/ffmpeg/lib/avutil-52.lib
    trunk/lib/win64_vc11/ffmpeg/lib/swresample-0.dll
    trunk/lib/win64_vc11/ffmpeg/lib/swresample-0.lib
    trunk/lib/win64_vc11/ffmpeg/lib/swscale-2.def
    trunk/lib/win64_vc11/ffmpeg/lib/swscale-2.dll
    trunk/lib/win64_vc11/ffmpeg/lib/swscale-2.lib
    trunk/lib/win64_vc11/png/include/png.h
    trunk/lib/win64_vc11/png/include/pngconf.h
    trunk/lib/win64_vc11/png/include/pnglibconf.h
    trunk/lib/win64_vc11/png/lib/libpng.lib
    trunk/lib/win64_vc11/python/lib/python33.dll
    trunk/lib/win64_vc11/python/lib/python33.lib
    trunk/lib/win64_vc11/release/python33.tar.gz
    trunk/lib/win64_vc11/release/python33_d.tar.gz

Added Paths:
-----------
    trunk/lib/win64_vc11/ffmpeg/lib/avcodec-55.def
    trunk/lib/win64_vc11/ffmpeg/lib/avcodec-55.dll
    trunk/lib/win64_vc11/ffmpeg/lib/avcodec-55.lib
    trunk/lib/win64_vc11/ffmpeg/lib/avdevice-55.def
    trunk/lib/win64_vc11/ffmpeg/lib/avdevice-55.dll
    trunk/lib/win64_vc11/ffmpeg/lib/avdevice-55.lib
    trunk/lib/win64_vc11/ffmpeg/lib/avformat-55.def
    trunk/lib/win64_vc11/ffmpeg/lib/avformat-55.dll
    trunk/lib/win64_vc11/ffmpeg/lib/avformat-55.lib
    trunk/lib/win64_vc11/png/include/libpng15/
    trunk/lib/win64_vc11/png/include/libpng15/png.h
    trunk/lib/win64_vc11/png/include/libpng15/pngconf.h
    trunk/lib/win64_vc11/png/include/libpng15/pnglibconf.h

Removed Paths:
-------------
    trunk/lib/win64_vc11/ffmpeg/lib/avcodec-54.def
    trunk/lib/win64_vc11/ffmpeg/lib/avcodec-54.dll
    trunk/lib/win64_vc11/ffmpeg/lib/avcodec-54.lib
    trunk/lib/win64_vc11/ffmpeg/lib/avdevice-54.def
    trunk/lib/win64_vc11/ffmpeg/lib/avdevice-54.dll
    trunk/lib/win64_vc11/ffmpeg/lib/avdevice-54.lib
    trunk/lib/win64_vc11/ffmpeg/lib/avformat-54.def
    trunk/lib/win64_vc11/ffmpeg/lib/avformat-54.dll
    trunk/lib/win64_vc11/ffmpeg/lib/avformat-54.lib
    trunk/lib/win64_vc11/png/include/libpng16/
    trunk/lib/win64_vc11/python/lib/python33_d.dll
    trunk/lib/win64_vc11/python/lib/python33_d.lib
    trunk/lib/win64_vc11/python/lib/python33_d.pdb

Modified: trunk/lib/win64_vc11/ffmpeg/include/libavcodec/avcodec.h
===================================================================
--- trunk/lib/win64_vc11/ffmpeg/include/libavcodec/avcodec.h	2013-12-06 17:01:28 UTC (rev 61249)
+++ trunk/lib/win64_vc11/ffmpeg/include/libavcodec/avcodec.h	2013-12-17 10:22:43 UTC (rev 61250)
@@ -23,20 +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
  * @{
@@ -154,7 +159,6 @@
     AV_CODEC_ID_MSZH,
     AV_CODEC_ID_ZLIB,
     AV_CODEC_ID_QTRLE,
-    AV_CODEC_ID_SNOW,
     AV_CODEC_ID_TSCC,
     AV_CODEC_ID_ULTI,
     AV_CODEC_ID_QDRAW,
@@ -268,6 +272,11 @@
     AV_CODEC_ID_CLLC,
     AV_CODEC_ID_MSS2,
     AV_CODEC_ID_VP9,
+    AV_CODEC_ID_AIC,
+    AV_CODEC_ID_ESCAPE130_DEPRECATED,
+    AV_CODEC_ID_G2M_DEPRECATED,
+    AV_CODEC_ID_WEBP_DEPRECATED,
+
     AV_CODEC_ID_BRENDER_PIX= MKBETAG('B','P','I','X'),
     AV_CODEC_ID_Y41P       = MKBETAG('Y','4','1','P'),
     AV_CODEC_ID_ESCAPE130  = MKBETAG('E','1','3','0'),
@@ -290,6 +299,11 @@
     AV_CODEC_ID_SGIRLE     = MKBETAG('S','G','I','R'),
     AV_CODEC_ID_MVC1       = MKBETAG('M','V','C','1'),
     AV_CODEC_ID_MVC2       = MKBETAG('M','V','C','2'),
+    AV_CODEC_ID_SNOW       = MKBETAG('S','N','O','W'),
+    AV_CODEC_ID_WEBP       = MKBETAG('W','E','B','P'),
+    AV_CODEC_ID_SMVJPEG    = MKBETAG('S','M','V','J'),
+    AV_CODEC_ID_HEVC       = MKBETAG('H','2','6','5'),
+#define AV_CODEC_ID_H265 AV_CODEC_ID_HEVC
 
     /* various PCM "codecs" */
     AV_CODEC_ID_FIRST_AUDIO = 0x10000,     ///< A dummy id pointing at the start of audio codecs
@@ -321,6 +335,8 @@
     AV_CODEC_ID_PCM_LXF,
     AV_CODEC_ID_S302M,
     AV_CODEC_ID_PCM_S8_PLANAR,
+    AV_CODEC_ID_PCM_S24LE_PLANAR_DEPRECATED,
+    AV_CODEC_ID_PCM_S32LE_PLANAR_DEPRECATED,
     AV_CODEC_ID_PCM_S24LE_PLANAR = MKBETAG(24,'P','S','P'),
     AV_CODEC_ID_PCM_S32LE_PLANAR = MKBETAG(32,'P','S','P'),
     AV_CODEC_ID_PCM_S16BE_PLANAR = MKBETAG('P','S','P',16),
@@ -359,6 +375,9 @@
     AV_CODEC_ID_VIMA       = MKBETAG('V','I','M','A'),
     AV_CODEC_ID_ADPCM_AFC  = MKBETAG('A','F','C',' '),
     AV_CODEC_ID_ADPCM_IMA_OKI = MKBETAG('O','K','I',' '),
+    AV_CODEC_ID_ADPCM_DTK  = MKBETAG('D','T','K',' '),
+    AV_CODEC_ID_ADPCM_IMA_RAD = MKBETAG('R','A','D',' '),
+    AV_CODEC_ID_ADPCM_G726LE = MKBETAG('6','2','7','G'),
 
     /* AMR */
     AV_CODEC_ID_AMR_NB = 0x12000,
@@ -407,7 +426,9 @@
     AV_CODEC_ID_MLP,
     AV_CODEC_ID_GSM_MS, /* as found in WAV */
     AV_CODEC_ID_ATRAC3,
+#if FF_API_VOXWARE
     AV_CODEC_ID_VOXWARE,
+#endif
     AV_CODEC_ID_APE,
     AV_CODEC_ID_NELLYMOSER,
     AV_CODEC_ID_MUSEPACK8,
@@ -439,10 +460,8 @@
     AV_CODEC_ID_OPUS_DEPRECATED,
     AV_CODEC_ID_COMFORT_NOISE,
     AV_CODEC_ID_TAK_DEPRECATED,
+    AV_CODEC_ID_METASOUND,
     AV_CODEC_ID_FFWAVESYNTH = MKBETAG('F','F','W','S'),
-#if LIBAVCODEC_VERSION_MAJOR <= 54
-    AV_CODEC_ID_8SVX_RAW    = MKBETAG('8','S','V','X'),
-#endif
     AV_CODEC_ID_SONIC       = MKBETAG('S','O','N','C'),
     AV_CODEC_ID_SONIC_LS    = MKBETAG('S','O','N','L'),
     AV_CODEC_ID_PAF_AUDIO   = MKBETAG('P','A','F','A'),
@@ -474,6 +493,7 @@
     AV_CODEC_ID_MPL2       = MKBETAG('M','P','L','2'),
     AV_CODEC_ID_VPLAYER    = MKBETAG('V','P','l','r'),
     AV_CODEC_ID_PJS        = MKBETAG('P','h','J','S'),
+    AV_CODEC_ID_ASS        = MKBETAG('A','S','S',' '),  ///< ASS as defined in Matroska
 
     /* other specific kind of codecs (generally used for attachments) */
     AV_CODEC_ID_FIRST_UNKNOWN = 0x18000,           ///< A dummy ID pointing at the start of various fake codecs.
@@ -483,7 +503,9 @@
     AV_CODEC_ID_IDF        = MKBETAG( 0 ,'I','D','F'),
     AV_CODEC_ID_OTF        = MKBETAG( 0 ,'O','T','F'),
     AV_CODEC_ID_SMPTE_KLV  = MKBETAG('K','L','V','A'),
+    AV_CODEC_ID_DVD_NAV    = MKBETAG('D','N','A','V'),
 
+
     AV_CODEC_ID_PROBE = 0x19000, ///< codec_id is not known (like AV_CODEC_ID_NONE) but lavf should attempt to identify it
 
     AV_CODEC_ID_MPEG2TS = 0x20000, /**< _FAKE_ codec to indicate a raw MPEG-2 TS
@@ -497,10 +519,6 @@
 #endif
 };
 
-#if FF_API_CODEC_ID
-#define CodecID AVCodecID
-#endif
-
 /**
  * This struct describes the properties of a single codec described by an
  * AVCodecID.
@@ -542,14 +560,15 @@
 #define AV_CODEC_PROP_LOSSLESS      (1 << 2)
 /**
  * Subtitle codec is bitmap based
+ * Decoded AVSubtitle data can be read from the AVSubtitleRect->pict field.
  */
 #define AV_CODEC_PROP_BITMAP_SUB    (1 << 16)
+/**
+ * Subtitle codec is text based.
+ * Decoded AVSubtitle data can be read from the AVSubtitleRect->ass field.
+ */
+#define AV_CODEC_PROP_TEXT_SUB      (1 << 17)
 
-#if FF_API_OLD_DECODE_AUDIO
-/* in bytes */
-#define AVCODEC_MAX_AUDIO_FRAME_SIZE 192000 // 1 second of 48khz 32bit audio
-#endif
-
 /**
  * @ingroup lavc_decoding
  * Required number of additionally allocated bytes at the end of the input bitstream for decoding.
@@ -581,8 +600,8 @@
     ME_X1,          ///< reserved for experiments
     ME_HEX,         ///< hexagon based search
     ME_UMH,         ///< uneven multi-hexagon search
-    ME_ITER,        ///< iterative search
     ME_TESA,        ///< transformed exhaustive search algorithm
+    ME_ITER=50,     ///< iterative search
 };
 
 /**
@@ -619,26 +638,6 @@
     AVCOL_TRC_NB             , ///< Not part of ABI
 };
 
-enum AVColorSpace{
-    AVCOL_SPC_RGB         = 0,
-    AVCOL_SPC_BT709       = 1, ///< also ITU-R BT1361 / IEC 61966-2-4 xvYCC709 / SMPTE RP177 Annex B
-    AVCOL_SPC_UNSPECIFIED = 2,
-    AVCOL_SPC_FCC         = 4,
-    AVCOL_SPC_BT470BG     = 5, ///< also ITU-R BT601-6 625 / ITU-R BT1358 625 / ITU-R BT1700 625 PAL & SECAM / IEC 61966-2-4 xvYCC601
-    AVCOL_SPC_SMPTE170M   = 6, ///< also ITU-R BT601-6 525 / ITU-R BT1358 525 / ITU-R BT1700 NTSC / functionally identical to above
-    AVCOL_SPC_SMPTE240M   = 7,
-    AVCOL_SPC_YCOCG       = 8, ///< Used by Dirac / VC-2 and H.264 FRext, see ITU-T SG16
-    AVCOL_SPC_NB             , ///< Not part of ABI
-};
-#define AVCOL_SPC_YCGCO AVCOL_SPC_YCOCG
-
-enum AVColorRange{
-    AVCOL_RANGE_UNSPECIFIED = 0,
-    AVCOL_RANGE_MPEG        = 1, ///< the normal 219*2^(n-8) "MPEG" YUV ranges
-    AVCOL_RANGE_JPEG        = 2, ///< the normal     2^n-1   "JPEG" YUV ranges
-    AVCOL_RANGE_NB             , ///< Not part of ABI
-};
-
 /**
  *  X   X      3 4 X      X are luma samples,
  *             1 2        1-6 are possible chroma positions
@@ -685,6 +684,11 @@
    Note: Not everything is supported yet.
 */
 
+/**
+ * Allow decoders to produce frames with data planes that are not aligned
+ * to CPU requirements (e.g. due to cropping).
+ */
+#define CODEC_FLAG_UNALIGNED 0x0001
 #define CODEC_FLAG_QSCALE 0x0002  ///< Use fixed qscale.
 #define CODEC_FLAG_4MV    0x0004  ///< 4 MV per MB allowed / advanced prediction for H.263.
 #define CODEC_FLAG_QPEL   0x0010  ///< Use qpel MC.
@@ -719,12 +723,6 @@
 #define CODEC_FLAG2_DROP_FRAME_TIMECODE 0x00002000 ///< timecode is in drop frame format. DEPRECATED!!!!
 #define CODEC_FLAG2_IGNORE_CROP   0x00010000 ///< Discard cropping information from SPS.
 
-#if FF_API_MPV_GLOBAL_OPTS
-#define CODEC_FLAG_CBP_RD         0x04000000 ///< Use rate distortion optimization for cbp.
-#define CODEC_FLAG_QP_RD          0x08000000 ///< Use rate distortion optimization for qp selectioon.
-#define CODEC_FLAG2_STRICT_GOP    0x00000002 ///< Strictly enforce GOP size.
-#define CODEC_FLAG2_SKIP_RD       0x00004000 ///< RD optimal MB level residual skipping
-#endif
 #define CODEC_FLAG2_CHUNKS        0x00008000 ///< Input bitstream might be truncated at a packet boundaries instead of only at frame boundaries.
 #define CODEC_FLAG2_SHOW_ALL      0x00400000 ///< Show all frames before the first keyframe
 
@@ -774,10 +772,12 @@
  * This can be used to prevent truncation of the last audio samples.
  */
 #define CODEC_CAP_SMALL_LAST_FRAME 0x0040
+#if FF_API_CAP_VDPAU
 /**
  * Codec can export data for HW decoding (VDPAU).
  */
 #define CODEC_CAP_HWACCEL_VDPAU    0x0080
+#endif
 /**
  * Codec can output multiple frames per AVPacket
  * Normally demuxers return one frame at a time, demuxers which do not do
@@ -892,6 +892,7 @@
 #define FF_QSCALE_TYPE_H264  2
 #define FF_QSCALE_TYPE_VP56  3
 
+#if FF_API_GET_BUFFER
 #define FF_BUFFER_TYPE_INTERNAL 1
 #define FF_BUFFER_TYPE_USER     2 ///< direct rendering buffers (image is (de)allocated by user)
 #define FF_BUFFER_TYPE_SHARED   4 ///< Buffer from somewhere else; don't deallocate image (data/base), all other tables are not shared.
@@ -901,8 +902,14 @@
 #define FF_BUFFER_HINTS_READABLE 0x02 // Codec will read from buffer.
 #define FF_BUFFER_HINTS_PRESERVE 0x04 // User must not alter buffer content.
 #define FF_BUFFER_HINTS_REUSABLE 0x08 // Codec will reuse the buffer (update).
+#endif
 
 /**
+ * The decoder will keep a reference to the frame and may reuse it later.
+ */
+#define AV_GET_BUFFER_FLAG_REF (1 << 0)
+
+/**
  * @defgroup lavc_packet AVPacket
  *
  * Types and functions for working with AVPacket.
@@ -995,6 +1002,17 @@
      * by data.
      */
     AV_PKT_DATA_MATROSKA_BLOCKADDITIONAL,
+
+    /**
+     * The optional first identifier line of a WebVTT cue.
+     */
+    AV_PKT_DATA_WEBVTT_IDENTIFIER,
+
+    /**
+     * The optional settings (rendering instructions) that immediately
+     * follow the timestamp specifier of a WebVTT cue.
+     */
+    AV_PKT_DATA_WEBVTT_SETTINGS,
 };
 
 /**
@@ -1009,18 +1027,24 @@
  * ABI. Thus it may be allocated on stack and no new fields can be added to it
  * without libavcodec and libavformat major bump.
  *
- * The semantics of data ownership depends on the destruct field.
- * If it is set, the packet data is dynamically allocated and is valid
- * indefinitely until av_free_packet() is called (which in turn calls the
- * destruct callback to free the data). If destruct is not set, the packet data
- * is typically backed by some static buffer somewhere and is only valid for a
- * limited time (e.g. until the next read call when demuxing).

@@ Diff output truncated at 10240 characters. @@



More information about the Bf-blender-cvs mailing list