[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [38976] trunk/lib/windows: Commiting FFmpeg-0.8.1 for Windows 32 bit
Sergey Sharybin
g.ulairi at gmail.com
Wed Aug 3 11:25:34 CEST 2011
Revision: 38976
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=38976
Author: nazgul
Date: 2011-08-03 09:25:34 +0000 (Wed, 03 Aug 2011)
Log Message:
-----------
Commiting FFmpeg-0.8.1 for Windows 32 bit
Added Paths:
-----------
trunk/lib/windows/ffmpeg-0.8/
trunk/lib/windows/ffmpeg-0.8/Readme.txt
trunk/lib/windows/ffmpeg-0.8/include/
trunk/lib/windows/ffmpeg-0.8/include/libavcodec/
trunk/lib/windows/ffmpeg-0.8/include/libavcodec/avcodec.h
trunk/lib/windows/ffmpeg-0.8/include/libavcodec/avfft.h
trunk/lib/windows/ffmpeg-0.8/include/libavcodec/dxva2.h
trunk/lib/windows/ffmpeg-0.8/include/libavcodec/opt.h
trunk/lib/windows/ffmpeg-0.8/include/libavcodec/vaapi.h
trunk/lib/windows/ffmpeg-0.8/include/libavcodec/vdpau.h
trunk/lib/windows/ffmpeg-0.8/include/libavcodec/version.h
trunk/lib/windows/ffmpeg-0.8/include/libavcodec/xvmc.h
trunk/lib/windows/ffmpeg-0.8/include/libavdevice/
trunk/lib/windows/ffmpeg-0.8/include/libavdevice/avdevice.h
trunk/lib/windows/ffmpeg-0.8/include/libavformat/
trunk/lib/windows/ffmpeg-0.8/include/libavformat/avformat.h
trunk/lib/windows/ffmpeg-0.8/include/libavformat/avio.h
trunk/lib/windows/ffmpeg-0.8/include/libavformat/version.h
trunk/lib/windows/ffmpeg-0.8/include/libavutil/
trunk/lib/windows/ffmpeg-0.8/include/libavutil/adler32.h
trunk/lib/windows/ffmpeg-0.8/include/libavutil/aes.h
trunk/lib/windows/ffmpeg-0.8/include/libavutil/attributes.h
trunk/lib/windows/ffmpeg-0.8/include/libavutil/audioconvert.h
trunk/lib/windows/ffmpeg-0.8/include/libavutil/avassert.h
trunk/lib/windows/ffmpeg-0.8/include/libavutil/avconfig.h
trunk/lib/windows/ffmpeg-0.8/include/libavutil/avstring.h
trunk/lib/windows/ffmpeg-0.8/include/libavutil/avutil.h
trunk/lib/windows/ffmpeg-0.8/include/libavutil/base64.h
trunk/lib/windows/ffmpeg-0.8/include/libavutil/bswap.h
trunk/lib/windows/ffmpeg-0.8/include/libavutil/common.h
trunk/lib/windows/ffmpeg-0.8/include/libavutil/cpu.h
trunk/lib/windows/ffmpeg-0.8/include/libavutil/crc.h
trunk/lib/windows/ffmpeg-0.8/include/libavutil/dict.h
trunk/lib/windows/ffmpeg-0.8/include/libavutil/error.h
trunk/lib/windows/ffmpeg-0.8/include/libavutil/eval.h
trunk/lib/windows/ffmpeg-0.8/include/libavutil/fifo.h
trunk/lib/windows/ffmpeg-0.8/include/libavutil/file.h
trunk/lib/windows/ffmpeg-0.8/include/libavutil/imgutils.h
trunk/lib/windows/ffmpeg-0.8/include/libavutil/intfloat_readwrite.h
trunk/lib/windows/ffmpeg-0.8/include/libavutil/intreadwrite.h
trunk/lib/windows/ffmpeg-0.8/include/libavutil/lfg.h
trunk/lib/windows/ffmpeg-0.8/include/libavutil/log.h
trunk/lib/windows/ffmpeg-0.8/include/libavutil/lzo.h
trunk/lib/windows/ffmpeg-0.8/include/libavutil/mathematics.h
trunk/lib/windows/ffmpeg-0.8/include/libavutil/md5.h
trunk/lib/windows/ffmpeg-0.8/include/libavutil/mem.h
trunk/lib/windows/ffmpeg-0.8/include/libavutil/opt.h
trunk/lib/windows/ffmpeg-0.8/include/libavutil/parseutils.h
trunk/lib/windows/ffmpeg-0.8/include/libavutil/pixdesc.h
trunk/lib/windows/ffmpeg-0.8/include/libavutil/pixfmt.h
trunk/lib/windows/ffmpeg-0.8/include/libavutil/random_seed.h
trunk/lib/windows/ffmpeg-0.8/include/libavutil/rational.h
trunk/lib/windows/ffmpeg-0.8/include/libavutil/samplefmt.h
trunk/lib/windows/ffmpeg-0.8/include/libavutil/sha.h
trunk/lib/windows/ffmpeg-0.8/include/libswscale/
trunk/lib/windows/ffmpeg-0.8/include/libswscale/swscale.h
trunk/lib/windows/ffmpeg-0.8/include/msvc/
trunk/lib/windows/ffmpeg-0.8/include/msvc/inttypes.h
trunk/lib/windows/ffmpeg-0.8/include/msvc/stdint.h
trunk/lib/windows/ffmpeg-0.8/lib/
trunk/lib/windows/ffmpeg-0.8/lib/avcodec-53.dll
trunk/lib/windows/ffmpeg-0.8/lib/avcodec-53.lib
trunk/lib/windows/ffmpeg-0.8/lib/avdevice-53.dll
trunk/lib/windows/ffmpeg-0.8/lib/avdevice-53.lib
trunk/lib/windows/ffmpeg-0.8/lib/avformat-53.dll
trunk/lib/windows/ffmpeg-0.8/lib/avformat-53.lib
trunk/lib/windows/ffmpeg-0.8/lib/avutil-51.dll
trunk/lib/windows/ffmpeg-0.8/lib/avutil-51.lib
trunk/lib/windows/ffmpeg-0.8/lib/swscale-2.dll
trunk/lib/windows/ffmpeg-0.8/lib/swscale-2.lib
Added: trunk/lib/windows/ffmpeg-0.8/Readme.txt
===================================================================
--- trunk/lib/windows/ffmpeg-0.8/Readme.txt (rev 0)
+++ trunk/lib/windows/ffmpeg-0.8/Readme.txt 2011-08-03 09:25:34 UTC (rev 38976)
@@ -0,0 +1,223 @@
+This directory contains ffmpeg library v0.8.1 from http://www.ffmpeg.org/releases/ (July 31d, 2011)
+Compiled by Sergey Sharybin in msys environment
+
+Quick notes
+===========
+
+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
+ #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;
+ typedef signed __int16 int16_t;
+ typedef signed __int32 int32_t;
+ typedef signed __int64 int64_t;
+5. There were some problems with linking blender against installed dll-s which
+ were solved by manual stripping dll (strip --strip-unneeded --strip-debug)
+ and generating .lib-files for them
+
+Environment configuration
+=========================
+
+1. Used 32 bit mingw/msys environment using this installer:
+ http://sourceforge.net/projects/mingw/files/Automated%20MinGW%20Installer/mingw-get-inst
+2. Used gcc-4.4.0 due to some incompatibilities between used libraries and newer compilers
+ http://sourceforge.net/projects/mingw/files/MinGW/BaseSystem/GCC/Version4/Previous%20Release%20gcc-4.4.0/
+3. Also used yasm: http://www.tortall.net/projects/yasm/wiki/Download
+4. Used pthread library frmo mingw-w64 sourceforge files download page
+
+Libraries configuration scripts
+===============================
+
+ffmpeg configuration
+--------------------
+
+LIBS="/home/sergey/lib"
+
+./configure \
+ --prefix=/home/sergey/lib/ffmpeg \
+ --enable-shared \
+ --disable-static \
+ --disable-avfilter \
+ --disable-vdpau \
+ --disable-bzlib \
+ --disable-libgsm \
+ --enable-libschroedinger \
+ --disable-libspeex \
+ --enable-libtheora \
+ --enable-libvorbis \
+ --enable-zlib \
+ --enable-libvpx \
+ --enable-libfaad \
+ --enable-stripping \
+ --enable-runtime-cpudetect \
+ --disable-vaapi \
+ --enable-libopenjpeg \
+ --disable-libfaac \
+ --disable-nonfree \
+ --enable-gpl \
+ --disable-postproc \
+ --disable-x11grab \
+ --enable-libdirac \
+ --enable-libmp3lame \
+ --disable-librtmp \
+ --enable-libx264 \
+ --enable-libxvid \
+ --disable-libopencore-amrnb \
+ --disable-libopencore-amrwb \
+ --disable-libdc1394 \
+ --disable-version3 \
+ --disable-debug \
+ --enable-w32threads \
+ --enable-memalign-hack \
+ --disable-ffplay \
+ --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}/faad/include -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}/faad/lib -L${LIBS}/zlib/lib"
+
+dirac configuration
+-------------------
+
+export CFLAGS="-g -Wall -Wextra"
+export LDFLAGS="-Wl,--as-needed -static-libgcc"
+
+./configure --prefix=/home/sergey/lib/dirac \
+ --disable-shared \
+ --enable-static
+
+faad configuration
+------------------
+
+export CFLAGS="-g -Wall -Wextra"
+export LDFLAGS="-Wl,--as-needed -static-libgcc"
+
+./configure --prefix=/home/sergey/lib/faad \
+ --disable-shared \
+ --enable-static
+
+lame configuration
+------------------
+
+export CFLAGS="-g -Wall -Wextra"
+export LDFLAGS="-Wl,--as-needed -static-libgcc"
+
+./configure --prefix=/home/sergey/lib/lame \
+ --disable-shared \
+ --enable-static \
+ --enable-export=full \
+ --with-fileio=sndfile \
+ --without-vorbis \
+ --enable-nasm \
+ --with-pic \
+ --disable-mp3x \
+ --disable-mp3rtp \
+ --disable-gtktest \
+ --enable-export=full
+
+libogg configuration
+--------------------
+
+export CFLAGS="-g -Wall -Wextra"
+export LDFLAGS="-Wl,--as-needed -static-libgcc"
+
+./configure \
+ --prefix=/home/sergey/lib/ogg \
+ --enable-static \
+ --disable-shared
+
+libvorbis configuration
+-----------------------
+
+export CFLAGS="-g -Wall -Wextra"
+export LDFLAGS="-Wl,--as-needed -static-libgcc"
+
+./configure \
+ --prefix=/home/sergey/lib/vorbis \
+ --enable-static \
+ --disable-shared \
+ --with-pic \
+ --with-ogg=/home/sergey/lib/ogg/
+
+libtheora configuration
+-----------------------
+
+export CFLAGS="-g -Wall -Wextra"
+export LDFLAGS="-Wl,--as-needed -static-libgcc"
+
+./configure \
+ --prefix=/home/sergey/lib/theora \
+ --enable-static \
+ --disable-shared \
+ --with-ogg=/home/sergey/lib/ogg \
+ --with-vorbis=/home/sergey/lib/vorbis
+
+libvpx configuration
+--------------------
+
+export CFLAGS="-g -Wall -Wextra"
+export LDFLAGS="-Wl,--as-needed -static-libgcc"
+
+./configure \
+ --prefix=/home/sergey/lib/vpx \
+ --disable-shared \
+ --disable-install-bins \
+ --disable-install-srcs \
+ --extra-cflags="-g -Wall -Wextra"
+
+openjpeg configuration
+----------------------
+
+export CFLAGS="-g -Wall -Wextra"
+export LDFLAGS="-Wl,--as-needed -static-libgcc"
+
+./configure \
+ --prefix=/home/sergey/lib/openjpeg \
+ --enable-static \
+ --disable-shared
+
+orc configuration
+-----------------
+
+export CFLAGS="-g -Wall -Wextra"
+export LDFLAGS="-Wl,--as-needed -static-libgcc"
+
+./configure --prefix=/home/sergey/lib/orc \
+ --disable-shared \
+ --enable-static
+
+schroedinger configuration
+--------------------------
+
+export CFLAGS="-g -Wall -Wextra -I/home/sergey/lib/orc/include/orc-0.4"
+export LDFLAGS="-Wl,--as-needed -static-libgcc -L/home/sergey/lib/orc/lib"
+export ORC_CFLAGS="-I/home/sergey/lib/orc/include/orc-0.4"
+export ORC_LDFLAGS="-L/home/sergey/lib/orc/lib"
+
+./configure --prefix=/home/sergey/lib/schroedinger \
+ --disable-shared \
+ --enable-static
+
+x264 configuration
+------------------
+
+./configure \
+ --prefix=/home/sergey/lib/x264 \
+ --extra-cflags="-g -Wall -Wextra" \
+ --extra-ldflags="-Wl,--as-needed -static-libgcc" \
+ --enable-static \
+ --enable-win32thread \
+ --disable-lavf \
+ --cross-prefix=mingw32- \
+ --host=mingw32
+
+xvidcore configuration
+----------------------
+
+export CFLAGS="-g -Wall -Wextra"
+export LDFLAGS="-Wl,--as-needed -static-libgcc"
+
+./configure \
+ --prefix=/home/sergey/lib/xvid
+
+- also used patch for xvid from http://code.google.com/p/mingw-w64-dgn/
Added: trunk/lib/windows/ffmpeg-0.8/include/libavcodec/avcodec.h
===================================================================
--- trunk/lib/windows/ffmpeg-0.8/include/libavcodec/avcodec.h (rev 0)
+++ trunk/lib/windows/ffmpeg-0.8/include/libavcodec/avcodec.h 2011-08-03 09:25:34 UTC (rev 38976)
@@ -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,
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list