[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [39876] trunk/lib: Adding FFmpeg static libraries for linux plaforms into lib/ repo

Sergey Sharybin g.ulairi at gmail.com
Fri Sep 2 16:22:12 CEST 2011


Revision: 39876
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=39876
Author:   nazgul
Date:     2011-09-02 14:22:11 +0000 (Fri, 02 Sep 2011)
Log Message:
-----------
Adding FFmpeg static libraries for linux plaforms into lib/ repo

Added Paths:
-----------
    trunk/lib/linux/
    trunk/lib/linux/ffmpeg/
    trunk/lib/linux/ffmpeg/include/
    trunk/lib/linux/ffmpeg/include/libavcodec/
    trunk/lib/linux/ffmpeg/include/libavcodec/avcodec.h
    trunk/lib/linux/ffmpeg/include/libavcodec/avfft.h
    trunk/lib/linux/ffmpeg/include/libavcodec/dxva2.h
    trunk/lib/linux/ffmpeg/include/libavcodec/opt.h
    trunk/lib/linux/ffmpeg/include/libavcodec/vaapi.h
    trunk/lib/linux/ffmpeg/include/libavcodec/vdpau.h
    trunk/lib/linux/ffmpeg/include/libavcodec/version.h
    trunk/lib/linux/ffmpeg/include/libavcodec/xvmc.h
    trunk/lib/linux/ffmpeg/include/libavdevice/
    trunk/lib/linux/ffmpeg/include/libavdevice/avdevice.h
    trunk/lib/linux/ffmpeg/include/libavformat/
    trunk/lib/linux/ffmpeg/include/libavformat/avformat.h
    trunk/lib/linux/ffmpeg/include/libavformat/avio.h
    trunk/lib/linux/ffmpeg/include/libavformat/version.h
    trunk/lib/linux/ffmpeg/include/libavutil/
    trunk/lib/linux/ffmpeg/include/libavutil/adler32.h
    trunk/lib/linux/ffmpeg/include/libavutil/aes.h
    trunk/lib/linux/ffmpeg/include/libavutil/attributes.h
    trunk/lib/linux/ffmpeg/include/libavutil/audioconvert.h
    trunk/lib/linux/ffmpeg/include/libavutil/avassert.h
    trunk/lib/linux/ffmpeg/include/libavutil/avconfig.h
    trunk/lib/linux/ffmpeg/include/libavutil/avstring.h
    trunk/lib/linux/ffmpeg/include/libavutil/avutil.h
    trunk/lib/linux/ffmpeg/include/libavutil/base64.h
    trunk/lib/linux/ffmpeg/include/libavutil/bswap.h
    trunk/lib/linux/ffmpeg/include/libavutil/common.h
    trunk/lib/linux/ffmpeg/include/libavutil/cpu.h
    trunk/lib/linux/ffmpeg/include/libavutil/crc.h
    trunk/lib/linux/ffmpeg/include/libavutil/dict.h
    trunk/lib/linux/ffmpeg/include/libavutil/error.h
    trunk/lib/linux/ffmpeg/include/libavutil/eval.h
    trunk/lib/linux/ffmpeg/include/libavutil/fifo.h
    trunk/lib/linux/ffmpeg/include/libavutil/file.h
    trunk/lib/linux/ffmpeg/include/libavutil/imgutils.h
    trunk/lib/linux/ffmpeg/include/libavutil/intfloat_readwrite.h
    trunk/lib/linux/ffmpeg/include/libavutil/intreadwrite.h
    trunk/lib/linux/ffmpeg/include/libavutil/lfg.h
    trunk/lib/linux/ffmpeg/include/libavutil/log.h
    trunk/lib/linux/ffmpeg/include/libavutil/lzo.h
    trunk/lib/linux/ffmpeg/include/libavutil/mathematics.h
    trunk/lib/linux/ffmpeg/include/libavutil/md5.h
    trunk/lib/linux/ffmpeg/include/libavutil/mem.h
    trunk/lib/linux/ffmpeg/include/libavutil/opt.h
    trunk/lib/linux/ffmpeg/include/libavutil/parseutils.h
    trunk/lib/linux/ffmpeg/include/libavutil/pixdesc.h
    trunk/lib/linux/ffmpeg/include/libavutil/pixfmt.h
    trunk/lib/linux/ffmpeg/include/libavutil/random_seed.h
    trunk/lib/linux/ffmpeg/include/libavutil/rational.h
    trunk/lib/linux/ffmpeg/include/libavutil/samplefmt.h
    trunk/lib/linux/ffmpeg/include/libavutil/sha.h
    trunk/lib/linux/ffmpeg/include/libswscale/
    trunk/lib/linux/ffmpeg/include/libswscale/swscale.h
    trunk/lib/linux/ffmpeg/lib/
    trunk/lib/linux/ffmpeg/lib/libavcodec.a
    trunk/lib/linux/ffmpeg/lib/libavdevice.a
    trunk/lib/linux/ffmpeg/lib/libavformat.a
    trunk/lib/linux/ffmpeg/lib/libavutil.a
    trunk/lib/linux/ffmpeg/lib/libdirac_encoder.a
    trunk/lib/linux/ffmpeg/lib/libfaad.a
    trunk/lib/linux/ffmpeg/lib/libmp3lame.a
    trunk/lib/linux/ffmpeg/lib/libogg.a
    trunk/lib/linux/ffmpeg/lib/liborc-0.4.a
    trunk/lib/linux/ffmpeg/lib/libschroedinger-1.0.a
    trunk/lib/linux/ffmpeg/lib/libswscale.a
    trunk/lib/linux/ffmpeg/lib/libtheora.a
    trunk/lib/linux/ffmpeg/lib/libvorbis.a
    trunk/lib/linux/ffmpeg/lib/libvorbisenc.a
    trunk/lib/linux/ffmpeg/lib/libvpx.a
    trunk/lib/linux/ffmpeg/lib/libx264.a
    trunk/lib/linux/ffmpeg/lib/libxvidcore.a
    trunk/lib/linux64/
    trunk/lib/linux64/ffmpeg/
    trunk/lib/linux64/ffmpeg/include/
    trunk/lib/linux64/ffmpeg/include/libavcodec/
    trunk/lib/linux64/ffmpeg/include/libavcodec/avcodec.h
    trunk/lib/linux64/ffmpeg/include/libavcodec/avfft.h
    trunk/lib/linux64/ffmpeg/include/libavcodec/dxva2.h
    trunk/lib/linux64/ffmpeg/include/libavcodec/opt.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/libavcodec/xvmc.h
    trunk/lib/linux64/ffmpeg/include/libavdevice/
    trunk/lib/linux64/ffmpeg/include/libavdevice/avdevice.h
    trunk/lib/linux64/ffmpeg/include/libavformat/
    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/
    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/avassert.h
    trunk/lib/linux64/ffmpeg/include/libavutil/avconfig.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/crc.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/intreadwrite.h
    trunk/lib/linux64/ffmpeg/include/libavutil/lfg.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/
    trunk/lib/linux64/ffmpeg/include/libswscale/swscale.h
    trunk/lib/linux64/ffmpeg/lib/
    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/libfaad.a
    trunk/lib/linux64/ffmpeg/lib/libmp3lame.a
    trunk/lib/linux64/ffmpeg/lib/libogg.a
    trunk/lib/linux64/ffmpeg/lib/liborc-0.4.a
    trunk/lib/linux64/ffmpeg/lib/libschroedinger-1.0.a
    trunk/lib/linux64/ffmpeg/lib/libswscale.a
    trunk/lib/linux64/ffmpeg/lib/libtheora.a
    trunk/lib/linux64/ffmpeg/lib/libvorbis.a
    trunk/lib/linux64/ffmpeg/lib/libvorbisenc.a
    trunk/lib/linux64/ffmpeg/lib/libvpx.a
    trunk/lib/linux64/ffmpeg/lib/libx264.a
    trunk/lib/linux64/ffmpeg/lib/libxvidcore.a

Added: trunk/lib/linux/ffmpeg/include/libavcodec/avcodec.h
===================================================================
--- trunk/lib/linux/ffmpeg/include/libavcodec/avcodec.h	                        (rev 0)
+++ trunk/lib/linux/ffmpeg/include/libavcodec/avcodec.h	2011-09-02 14:22:11 UTC (rev 39876)
@@ -0,0 +1,4254 @@
+/*
+ * copyright (c) 2001 Fabrice Bellard
+ *
+ * This file is part of FFmpeg.
+ *
+ * FFmpeg is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * FFmpeg is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with FFmpeg; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#ifndef AVCODEC_AVCODEC_H
+#define AVCODEC_AVCODEC_H
+
+/**
+ * @file
+ * external API header
+ */
+
+#include <errno.h>
+#include "libavutil/samplefmt.h"
+#include "libavutil/avutil.h"
+#include "libavutil/cpu.h"
+
+#include "libavcodec/version.h"
+
+/**
+ * Identify the syntax and semantics of the bitstream.
+ * The principle is roughly:
+ * Two decoders with the same ID can decode the same streams.
+ * Two encoders with the same ID can encode compatible streams.
+ * There may be slight deviations from the principle due to implementation
+ * details.
+ *
+ * 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.
+ */
+enum CodecID {
+    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,
+    CODEC_ID_FFH264,
+    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,
+    CODEC_ID_8SVX_EXP,
+    CODEC_ID_8SVX_FIB,
+    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_8SVX_RAW,
+
+    /* various PCM "codecs" */
+    CODEC_ID_PCM_S16LE= 0x10000,
+    CODEC_ID_PCM_S16BE,
+    CODEC_ID_PCM_U16LE,
+    CODEC_ID_PCM_U16BE,
+    CODEC_ID_PCM_S8,
+    CODEC_ID_PCM_U8,
+    CODEC_ID_PCM_MULAW,
+    CODEC_ID_PCM_ALAW,
+    CODEC_ID_PCM_S32LE,
+    CODEC_ID_PCM_S32BE,
+    CODEC_ID_PCM_U32LE,
+    CODEC_ID_PCM_U32BE,
+    CODEC_ID_PCM_S24LE,
+    CODEC_ID_PCM_S24BE,
+    CODEC_ID_PCM_U24LE,
+    CODEC_ID_PCM_U24BE,
+    CODEC_ID_PCM_S24DAUD,
+    CODEC_ID_PCM_ZORK,
+    CODEC_ID_PCM_S16LE_PLANAR,
+    CODEC_ID_PCM_DVD,
+    CODEC_ID_PCM_F32BE,
+    CODEC_ID_PCM_F32LE,
+    CODEC_ID_PCM_F64BE,
+    CODEC_ID_PCM_F64LE,
+    CODEC_ID_PCM_BLURAY,
+    CODEC_ID_PCM_LXF,
+    CODEC_ID_S302M,
+
+    /* various ADPCM codecs */
+    CODEC_ID_ADPCM_IMA_QT= 0x11000,
+    CODEC_ID_ADPCM_IMA_WAV,
+    CODEC_ID_ADPCM_IMA_DK3,
+    CODEC_ID_ADPCM_IMA_DK4,
+    CODEC_ID_ADPCM_IMA_WS,
+    CODEC_ID_ADPCM_IMA_SMJPEG,
+    CODEC_ID_ADPCM_MS,
+    CODEC_ID_ADPCM_4XM,
+    CODEC_ID_ADPCM_XA,
+    CODEC_ID_ADPCM_ADX,
+    CODEC_ID_ADPCM_EA,
+    CODEC_ID_ADPCM_G726,
+    CODEC_ID_ADPCM_CT,
+    CODEC_ID_ADPCM_SWF,
+    CODEC_ID_ADPCM_YAMAHA,
+    CODEC_ID_ADPCM_SBPRO_4,
+    CODEC_ID_ADPCM_SBPRO_3,
+    CODEC_ID_ADPCM_SBPRO_2,
+    CODEC_ID_ADPCM_THP,
+    CODEC_ID_ADPCM_IMA_AMV,
+    CODEC_ID_ADPCM_EA_R1,
+    CODEC_ID_ADPCM_EA_R3,
+    CODEC_ID_ADPCM_EA_R2,
+    CODEC_ID_ADPCM_IMA_EA_SEAD,
+    CODEC_ID_ADPCM_IMA_EA_EACS,
+    CODEC_ID_ADPCM_EA_XAS,
+    CODEC_ID_ADPCM_EA_MAXIS_XA,
+    CODEC_ID_ADPCM_IMA_ISS,
+    CODEC_ID_ADPCM_G722,
+
+    /* AMR */
+    CODEC_ID_AMR_NB= 0x12000,
+    CODEC_ID_AMR_WB,
+
+    /* RealAudio codecs*/
+    CODEC_ID_RA_144= 0x13000,
+    CODEC_ID_RA_288,
+
+    /* various DPCM codecs */
+    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_MP3, ///< preferred ID for decoding MPEG audio layer 1, 2 or 3
+    CODEC_ID_AAC,
+    CODEC_ID_AC3,
+    CODEC_ID_DTS,
+    CODEC_ID_VORBIS,
+    CODEC_ID_DVAUDIO,
+    CODEC_ID_WMAV1,
+    CODEC_ID_WMAV2,
+    CODEC_ID_MACE3,
+    CODEC_ID_MACE6,
+    CODEC_ID_VMDAUDIO,
+    CODEC_ID_SONIC,
+    CODEC_ID_SONIC_LS,
+    CODEC_ID_FLAC,
+    CODEC_ID_MP3ADU,
+    CODEC_ID_MP3ON4,
+    CODEC_ID_SHORTEN,
+    CODEC_ID_ALAC,
+    CODEC_ID_WESTWOOD_SND1,
+    CODEC_ID_GSM, ///< as in Berlin toast format
+    CODEC_ID_QDM2,
+    CODEC_ID_COOK,
+    CODEC_ID_TRUESPEECH,
+    CODEC_ID_TTA,
+    CODEC_ID_SMACKAUDIO,
+    CODEC_ID_QCELP,
+    CODEC_ID_WAVPACK,
+    CODEC_ID_DSICINAUDIO,
+    CODEC_ID_IMC,
+    CODEC_ID_MUSEPACK7,
+    CODEC_ID_MLP,
+    CODEC_ID_GSM_MS, /* as found in WAV */
+    CODEC_ID_ATRAC3,
+    CODEC_ID_VOXWARE,
+    CODEC_ID_APE,
+    CODEC_ID_NELLYMOSER,
+    CODEC_ID_MUSEPACK8,
+    CODEC_ID_SPEEX,
+    CODEC_ID_WMAVOICE,
+    CODEC_ID_WMAPRO,
+    CODEC_ID_WMALOSSLESS,
+    CODEC_ID_ATRAC3P,
+    CODEC_ID_EAC3,
+    CODEC_ID_SIPR,
+    CODEC_ID_MP1,
+    CODEC_ID_TWINVQ,
+    CODEC_ID_TRUEHD,
+    CODEC_ID_MP4ALS,
+    CODEC_ID_ATRAC1,
+    CODEC_ID_BINKAUDIO_RDFT,
+    CODEC_ID_BINKAUDIO_DCT,
+    CODEC_ID_AAC_LATM,
+    CODEC_ID_QDMC,
+    CODEC_ID_CELT,
+
+    /* subtitle codecs */
+    CODEC_ID_DVD_SUBTITLE= 0x17000,
+    CODEC_ID_DVB_SUBTITLE,
+    CODEC_ID_TEXT,  ///< raw UTF-8 text
+    CODEC_ID_XSUB,
+    CODEC_ID_SSA,
+    CODEC_ID_MOV_TEXT,
+    CODEC_ID_HDMV_PGS_SUBTITLE,
+    CODEC_ID_DVB_TELETEXT,
+    CODEC_ID_SRT,
+    CODEC_ID_MICRODVD,
+
+    /* other specific kind of codecs (generally used for attachments) */
+    CODEC_ID_TTF= 0x18000,
+
+    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
+                                * stream (only used by libavformat) */
+    CODEC_ID_FFMETADATA=0x21000,   ///< Dummy codec for streams containing only metadata information.
+};
+
+#if FF_API_OLD_SAMPLE_FMT
+#define SampleFormat AVSampleFormat
+
+#define SAMPLE_FMT_NONE AV_SAMPLE_FMT_NONE
+#define SAMPLE_FMT_U8   AV_SAMPLE_FMT_U8
+#define SAMPLE_FMT_S16  AV_SAMPLE_FMT_S16
+#define SAMPLE_FMT_S32  AV_SAMPLE_FMT_S32
+#define SAMPLE_FMT_FLT  AV_SAMPLE_FMT_FLT
+#define SAMPLE_FMT_DBL  AV_SAMPLE_FMT_DBL
+#define SAMPLE_FMT_NB   AV_SAMPLE_FMT_NB
+#endif
+
+#if FF_API_OLD_AUDIOCONVERT
+#include "libavutil/audioconvert.h"
+
+/* Audio channel masks */
+#define CH_FRONT_LEFT            AV_CH_FRONT_LEFT
+#define CH_FRONT_RIGHT           AV_CH_FRONT_RIGHT
+#define CH_FRONT_CENTER          AV_CH_FRONT_CENTER
+#define CH_LOW_FREQUENCY         AV_CH_LOW_FREQUENCY
+#define CH_BACK_LEFT             AV_CH_BACK_LEFT
+#define CH_BACK_RIGHT            AV_CH_BACK_RIGHT
+#define CH_FRONT_LEFT_OF_CENTER  AV_CH_FRONT_LEFT_OF_CENTER
+#define CH_FRONT_RIGHT_OF_CENTER AV_CH_FRONT_RIGHT_OF_CENTER
+#define CH_BACK_CENTER           AV_CH_BACK_CENTER
+#define CH_SIDE_LEFT             AV_CH_SIDE_LEFT
+#define CH_SIDE_RIGHT            AV_CH_SIDE_RIGHT
+#define CH_TOP_CENTER            AV_CH_TOP_CENTER
+#define CH_TOP_FRONT_LEFT        AV_CH_TOP_FRONT_LEFT
+#define CH_TOP_FRONT_CENTER      AV_CH_TOP_FRONT_CENTER
+#define CH_TOP_FRONT_RIGHT       AV_CH_TOP_FRONT_RIGHT

@@ Diff output truncated at 10240 characters. @@



More information about the Bf-blender-cvs mailing list