[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [43799] trunk/lib/linux64/ffmpeg: Linux64 FFmpeg libraries upgrade to version 0.10

Sergey Sharybin sergey.vfx at gmail.com
Tue Jan 31 20:17:15 CET 2012


Revision: 43799
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=43799
Author:   nazgul
Date:     2012-01-31 19:17:14 +0000 (Tue, 31 Jan 2012)
Log Message:
-----------
Linux64 FFmpeg libraries upgrade to version 0.10

Modified Paths:
--------------
    trunk/lib/linux64/ffmpeg/Readme.txt
    trunk/lib/linux64/ffmpeg/include/libavcodec/avcodec.h
    trunk/lib/linux64/ffmpeg/include/libavcodec/dxva2.h
    trunk/lib/linux64/ffmpeg/include/libavcodec/vaapi.h
    trunk/lib/linux64/ffmpeg/include/libavcodec/vdpau.h
    trunk/lib/linux64/ffmpeg/include/libavcodec/version.h
    trunk/lib/linux64/ffmpeg/include/libavdevice/avdevice.h
    trunk/lib/linux64/ffmpeg/include/libavformat/avformat.h
    trunk/lib/linux64/ffmpeg/include/libavformat/avio.h
    trunk/lib/linux64/ffmpeg/include/libavformat/version.h
    trunk/lib/linux64/ffmpeg/include/libavutil/adler32.h
    trunk/lib/linux64/ffmpeg/include/libavutil/aes.h
    trunk/lib/linux64/ffmpeg/include/libavutil/attributes.h
    trunk/lib/linux64/ffmpeg/include/libavutil/audioconvert.h
    trunk/lib/linux64/ffmpeg/include/libavutil/avstring.h
    trunk/lib/linux64/ffmpeg/include/libavutil/avutil.h
    trunk/lib/linux64/ffmpeg/include/libavutil/base64.h
    trunk/lib/linux64/ffmpeg/include/libavutil/bswap.h
    trunk/lib/linux64/ffmpeg/include/libavutil/common.h
    trunk/lib/linux64/ffmpeg/include/libavutil/cpu.h
    trunk/lib/linux64/ffmpeg/include/libavutil/dict.h
    trunk/lib/linux64/ffmpeg/include/libavutil/error.h
    trunk/lib/linux64/ffmpeg/include/libavutil/eval.h
    trunk/lib/linux64/ffmpeg/include/libavutil/fifo.h
    trunk/lib/linux64/ffmpeg/include/libavutil/file.h
    trunk/lib/linux64/ffmpeg/include/libavutil/imgutils.h
    trunk/lib/linux64/ffmpeg/include/libavutil/intfloat_readwrite.h
    trunk/lib/linux64/ffmpeg/include/libavutil/log.h
    trunk/lib/linux64/ffmpeg/include/libavutil/lzo.h
    trunk/lib/linux64/ffmpeg/include/libavutil/mathematics.h
    trunk/lib/linux64/ffmpeg/include/libavutil/md5.h
    trunk/lib/linux64/ffmpeg/include/libavutil/mem.h
    trunk/lib/linux64/ffmpeg/include/libavutil/opt.h
    trunk/lib/linux64/ffmpeg/include/libavutil/parseutils.h
    trunk/lib/linux64/ffmpeg/include/libavutil/pixdesc.h
    trunk/lib/linux64/ffmpeg/include/libavutil/pixfmt.h
    trunk/lib/linux64/ffmpeg/include/libavutil/random_seed.h
    trunk/lib/linux64/ffmpeg/include/libavutil/rational.h
    trunk/lib/linux64/ffmpeg/include/libavutil/samplefmt.h
    trunk/lib/linux64/ffmpeg/include/libavutil/sha.h
    trunk/lib/linux64/ffmpeg/include/libswscale/swscale.h
    trunk/lib/linux64/ffmpeg/lib/libavcodec.a
    trunk/lib/linux64/ffmpeg/lib/libavdevice.a
    trunk/lib/linux64/ffmpeg/lib/libavformat.a
    trunk/lib/linux64/ffmpeg/lib/libavutil.a
    trunk/lib/linux64/ffmpeg/lib/libdirac_encoder.a
    trunk/lib/linux64/ffmpeg/lib/libswscale.a
    trunk/lib/linux64/ffmpeg/lib/libx264.a

Added Paths:
-----------
    trunk/lib/linux64/ffmpeg/include/libavcodec/vda.h

Modified: trunk/lib/linux64/ffmpeg/Readme.txt
===================================================================
--- trunk/lib/linux64/ffmpeg/Readme.txt	2012-01-31 19:16:54 UTC (rev 43798)
+++ trunk/lib/linux64/ffmpeg/Readme.txt	2012-01-31 19:17:14 UTC (rev 43799)
@@ -1,4 +1,4 @@
-This directory contains ffmpeg library v0.8.7 from http://www.ffmpeg.org/releases/ (November 24th, 2011)
+This directory contains ffmpeg library v0.10 from http://www.ffmpeg.org/releases/ (January 31th, 2012)
 Compiled by Sergey Sharybin in release builder environment
 
 ffmpeg configuration
@@ -7,7 +7,7 @@
 ./configure \
     --cc="/usr/bin/gcc-4.4 -Wl,--as-needed" \
     --extra-ldflags="-pthread -static-libgcc" \
-    --prefix=/opt/ffmpeg-0.8.7 \
+    --prefix=/opt/ffmpeg-0.10 \
     --enable-static \
     --disable-avfilter \
     --disable-vdpau \

Modified: trunk/lib/linux64/ffmpeg/include/libavcodec/avcodec.h
===================================================================
--- trunk/lib/linux64/ffmpeg/include/libavcodec/avcodec.h	2012-01-31 19:16:54 UTC (rev 43798)
+++ trunk/lib/linux64/ffmpeg/include/libavcodec/avcodec.h	2012-01-31 19:17:14 UTC (rev 43799)
@@ -31,9 +31,43 @@
 #include "libavutil/avutil.h"
 #include "libavutil/cpu.h"
 #include "libavutil/dict.h"
+#include "libavutil/log.h"
+#include "libavutil/pixfmt.h"
+#include "libavutil/rational.h"
 
 #include "libavcodec/version.h"
+/**
+ * @defgroup libavc Encoding/Decoding Library
+ * @{
+ *
+ * @defgroup lavc_decoding Decoding
+ * @{
+ * @}
+ *
+ * @defgroup lavc_encoding Encoding
+ * @{
+ * @}
+ *
+ * @defgroup lavc_codec Codecs
+ * @{
+ * @defgroup lavc_codec_native Native Codecs
+ * @{
+ * @}
+ * @defgroup lavc_codec_wrappers External library wrappers
+ * @{
+ * @}
+ * @defgroup lavc_codec_hwaccel Hardware Accelerators bridge
+ * @{
+ * @}
+ * @}
+ * @defgroup lavc_internal Internal
+ * @{
+ * @}
+ * @}
+ *
+ */
 
+
 /**
  * Identify the syntax and semantics of the bitstream.
  * The principle is roughly:
@@ -44,7 +78,8 @@
  *
  * 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. it is as close as possible to similar codecs.
+ * 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.
  */
 enum CodecID {
     CODEC_ID_NONE,
@@ -149,7 +184,9 @@
     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,
@@ -167,8 +204,10 @@
     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,
@@ -205,10 +244,30 @@
     CODEC_ID_PRORES,
     CODEC_ID_JV,
     CODEC_ID_DFA,
-    CODEC_ID_8SVX_RAW,
+    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'),
 
+    CODEC_ID_G2M        = MKBETAG( 0 ,'G','2','M'),
+    CODEC_ID_V308       = MKBETAG('V','3','0','8'),
+    CODEC_ID_YUV4       = MKBETAG('Y','U','V','4'),
+
     /* various PCM "codecs" */
-    CODEC_ID_PCM_S16LE= 0x10000,
+    CODEC_ID_FIRST_AUDIO = 0x10000,     ///< A dummy id pointing at the start of audio codecs
+    CODEC_ID_PCM_S16LE = 0x10000,
     CODEC_ID_PCM_S16BE,
     CODEC_ID_PCM_U16LE,
     CODEC_ID_PCM_U16BE,
@@ -235,9 +294,10 @@
     CODEC_ID_PCM_BLURAY,
     CODEC_ID_PCM_LXF,
     CODEC_ID_S302M,
+    CODEC_ID_PCM_S8_PLANAR,
 
     /* various ADPCM codecs */
-    CODEC_ID_ADPCM_IMA_QT= 0x11000,
+    CODEC_ID_ADPCM_IMA_QT = 0x11000,
     CODEC_ID_ADPCM_IMA_WAV,
     CODEC_ID_ADPCM_IMA_DK3,
     CODEC_ID_ADPCM_IMA_DK4,
@@ -266,23 +326,24 @@
     CODEC_ID_ADPCM_EA_MAXIS_XA,
     CODEC_ID_ADPCM_IMA_ISS,
     CODEC_ID_ADPCM_G722,
+    CODEC_ID_ADPCM_IMA_APC,
 
     /* AMR */
-    CODEC_ID_AMR_NB= 0x12000,
+    CODEC_ID_AMR_NB = 0x12000,
     CODEC_ID_AMR_WB,
 
     /* RealAudio codecs*/
-    CODEC_ID_RA_144= 0x13000,
+    CODEC_ID_RA_144 = 0x13000,
     CODEC_ID_RA_288,
 
     /* various DPCM codecs */
-    CODEC_ID_ROQ_DPCM= 0x14000,
+    CODEC_ID_ROQ_DPCM = 0x14000,
     CODEC_ID_INTERPLAY_DPCM,
     CODEC_ID_XAN_DPCM,
     CODEC_ID_SOL_DPCM,
 
     /* audio codecs */
-    CODEC_ID_MP2= 0x15000,
+    CODEC_ID_MP2 = 0x15000,
     CODEC_ID_MP3, ///< preferred ID for decoding MPEG audio layer 1, 2 or 3
     CODEC_ID_AAC,
     CODEC_ID_AC3,
@@ -294,8 +355,10 @@
     CODEC_ID_MACE3,
     CODEC_ID_MACE6,
     CODEC_ID_VMDAUDIO,
+#if LIBAVCODEC_VERSION_MAJOR == 53
     CODEC_ID_SONIC,
     CODEC_ID_SONIC_LS,
+#endif
     CODEC_ID_FLAC,
     CODEC_ID_MP3ADU,
     CODEC_ID_MP3ON4,
@@ -337,9 +400,21 @@
     CODEC_ID_AAC_LATM,
     CODEC_ID_QDMC,
     CODEC_ID_CELT,
+#if LIBAVCODEC_VERSION_MAJOR > 53
+    CODEC_ID_G723_1_DEPRECATED,
+    CODEC_ID_G729_DEPRECATED,
+    CODEC_ID_8SVX_EXP,
+    CODEC_ID_8SVX_FIB,
+#endif
+    CODEC_ID_BMV_AUDIO,
+    CODEC_ID_G729 = 0x15800,
+    CODEC_ID_G723_1= 0x15801,
+    CODEC_ID_FFWAVESYNTH = MKBETAG('F','F','W','S'),
+    CODEC_ID_8SVX_RAW   = MKBETAG('8','S','V','X'),
 
     /* subtitle codecs */
-    CODEC_ID_DVD_SUBTITLE= 0x17000,
+    CODEC_ID_FIRST_SUBTITLE = 0x17000,          ///< A dummy ID pointing at the start of subtitle codecs.
+    CODEC_ID_DVD_SUBTITLE = 0x17000,
     CODEC_ID_DVB_SUBTITLE,
     CODEC_ID_TEXT,  ///< raw UTF-8 text
     CODEC_ID_XSUB,
@@ -348,16 +423,22 @@
     CODEC_ID_HDMV_PGS_SUBTITLE,
     CODEC_ID_DVB_TELETEXT,
     CODEC_ID_SRT,
-    CODEC_ID_MICRODVD,
+    CODEC_ID_MICRODVD   = MKBETAG('m','D','V','D'),
 
     /* other specific kind of codecs (generally used for attachments) */
-    CODEC_ID_TTF= 0x18000,
+    CODEC_ID_FIRST_UNKNOWN = 0x18000,           ///< A dummy ID pointing at the start of various fake codecs.
+    CODEC_ID_TTF = 0x18000,
+    CODEC_ID_BINTEXT    = MKBETAG('B','T','X','T'),
+    CODEC_ID_XBIN       = MKBETAG('X','B','I','N'),
+    CODEC_ID_IDF        = MKBETAG( 0 ,'I','D','F'),
 
-    CODEC_ID_PROBE= 0x19000, ///< codec_id is not known (like CODEC_ID_NONE) but lavf should attempt to identify it
+    CODEC_ID_PROBE = 0x19000, ///< codec_id is not known (like CODEC_ID_NONE) but lavf should attempt to identify it
 
-    CODEC_ID_MPEG2TS= 0x20000, /**< _FAKE_ codec to indicate a raw MPEG-2 TS
+    CODEC_ID_MPEG2TS = 0x20000, /**< _FAKE_ codec to indicate a raw MPEG-2 TS
                                 * stream (only used by libavformat) */
-    CODEC_ID_FFMETADATA=0x21000,   ///< Dummy codec for streams containing only metadata information.
+    CODEC_ID_MPEG4SYSTEMS = 0x20001, /**< _FAKE_ codec to indicate a MPEG-4 Systems
+                                * stream (only used by libavformat) */
+    CODEC_ID_FFMETADATA = 0x21000,   ///< Dummy codec for streams containing only metadata information.
 };
 
 #if FF_API_OLD_SAMPLE_FMT
@@ -420,8 +501,10 @@
 #define CH_LAYOUT_STEREO_DOWNMIX AV_CH_LAYOUT_STEREO_DOWNMIX
 #endif
 
+#if FF_API_OLD_DECODE_AUDIO
 /* in bytes */
 #define AVCODEC_MAX_AUDIO_FRAME_SIZE 192000 // 1 second of 48khz 32bit audio
+#endif
 
 /**
  * Required number of additionally allocated bytes at the end of the input bitstream for decoding.
@@ -430,7 +513,7 @@
  * Note: If the first 23 bits of the additional bytes are not 0, then damaged
  * MPEG bitstreams could cause overread and segfault.
  */
-#define FF_INPUT_BUFFER_PADDING_SIZE 8
+#define FF_INPUT_BUFFER_PADDING_SIZE 16
 
 /**
  * minimum encoding buffer size
@@ -482,6 +565,7 @@
     AVCOL_TRC_UNSPECIFIED=2,
     AVCOL_TRC_GAMMA22    =4, ///< also ITU-R BT470M / ITU-R BT1700 625 PAL & SECAM
     AVCOL_TRC_GAMMA28    =5, ///< also ITU-R BT470BG
+    AVCOL_TRC_SMPTE240M  =7,
     AVCOL_TRC_NB           , ///< Not part of ABI
 };
 
@@ -493,6 +577,7 @@
     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_YCGCO      =8,
     AVCOL_SPC_NB           , ///< Not part of ABI
 };
 
@@ -523,7 +608,7 @@
 /**
  * LPC analysis type
  */
-attribute_deprecated enum AVLPCType {
+enum AVLPCType {
     AV_LPC_TYPE_DEFAULT     = -1, ///< use the codec default LPC type
     AV_LPC_TYPE_NONE        =  0, ///< do not use LPC prediction or use all zero coefficients
     AV_LPC_TYPE_FIXED       =  1, ///< fixed LPC coefficients
@@ -565,7 +650,6 @@
 #define CODEC_FLAG_QPEL   0x0010  ///< Use qpel MC.
 #define CODEC_FLAG_GMC    0x0020  ///< Use GMC.
 #define CODEC_FLAG_MV0    0x0040  ///< Always try a MB with MV=<0,0>.
-#define CODEC_FLAG_PART   0x0080  ///< Use data partitioning.
 /**
  * The parent program guarantees that the input for B-frames containing
  * streams is not written to for at least s->max_b_frames+1 frames, if
@@ -574,7 +658,6 @@
 #define CODEC_FLAG_INPUT_PRESERVED 0x0100
 #define CODEC_FLAG_PASS1           0x0200   ///< Use internal 2pass ratecontrol in first pass mode.
 #define CODEC_FLAG_PASS2           0x0400   ///< Use internal 2pass ratecontrol in second pass mode.
-#define CODEC_FLAG_EXTERN_HUFF     0x1000   ///< Use external Huffman table (for MJPEG).
 #define CODEC_FLAG_GRAY            0x2000   ///< Only decode/encode grayscale.
 #define CODEC_FLAG_EMU_EDGE        0x4000   ///< Don't draw edges.
 #define CODEC_FLAG_PSNR            0x8000   ///< error[?] variables will be set during encoding.
@@ -583,25 +666,43 @@
 #define CODEC_FLAG_NORMALIZE_AQP  0x00020000 ///< Normalize adaptive quantization.
 #define CODEC_FLAG_INTERLACED_DCT 0x00040000 ///< Use interlaced DCT.
 #define CODEC_FLAG_LOW_DELAY      0x00080000 ///< Force low delay.
-#define CODEC_FLAG_ALT_SCAN       0x00100000 ///< Use alternate scan.
 #define CODEC_FLAG_GLOBAL_HEADER  0x00400000 ///< Place global headers in extradata instead of every keyframe.
 #define CODEC_FLAG_BITEXACT       0x00800000 ///< Use only bitexact stuff (except (I)DCT).

@@ Diff output truncated at 10240 characters. @@


More information about the Bf-blender-cvs mailing list