[Bf-blender-cvs] SVN commit: /data/svn/repos/bf-blender [61674] trunk/lib/win64_vc14/ffmpeg: MSVC 2015 windows x64 ffmpeg ( copy from vc12 for now )
Martijn Berger
martijn.berger at gmail.com
Tue May 31 14:41:57 CEST 2016
Revision: 61674
https://developer.blender.org/rBL61674
Author: juicyfruit
Date: 2016-05-31 14:41:56 +0200 (Tue, 31 May 2016)
Log Message:
-----------
MSVC 2015 windows x64 ffmpeg ( copy from vc12 for now )
Added Paths:
-----------
trunk/lib/win64_vc14/ffmpeg/
trunk/lib/win64_vc14/ffmpeg/Readme.txt
trunk/lib/win64_vc14/ffmpeg/include/
trunk/lib/win64_vc14/ffmpeg/include/libavcodec/
trunk/lib/win64_vc14/ffmpeg/include/libavcodec/avcodec.h
trunk/lib/win64_vc14/ffmpeg/include/libavcodec/avfft.h
trunk/lib/win64_vc14/ffmpeg/include/libavcodec/dxva2.h
trunk/lib/win64_vc14/ffmpeg/include/libavcodec/old_codec_ids.h
trunk/lib/win64_vc14/ffmpeg/include/libavcodec/vaapi.h
trunk/lib/win64_vc14/ffmpeg/include/libavcodec/vda.h
trunk/lib/win64_vc14/ffmpeg/include/libavcodec/vdpau.h
trunk/lib/win64_vc14/ffmpeg/include/libavcodec/version.h
trunk/lib/win64_vc14/ffmpeg/include/libavcodec/xvmc.h
trunk/lib/win64_vc14/ffmpeg/include/libavdevice/
trunk/lib/win64_vc14/ffmpeg/include/libavdevice/avdevice.h
trunk/lib/win64_vc14/ffmpeg/include/libavdevice/version.h
trunk/lib/win64_vc14/ffmpeg/include/libavformat/
trunk/lib/win64_vc14/ffmpeg/include/libavformat/avformat.h
trunk/lib/win64_vc14/ffmpeg/include/libavformat/avio.h
trunk/lib/win64_vc14/ffmpeg/include/libavformat/version.h
trunk/lib/win64_vc14/ffmpeg/include/libavutil/
trunk/lib/win64_vc14/ffmpeg/include/libavutil/adler32.h
trunk/lib/win64_vc14/ffmpeg/include/libavutil/aes.h
trunk/lib/win64_vc14/ffmpeg/include/libavutil/attributes.h
trunk/lib/win64_vc14/ffmpeg/include/libavutil/audio_fifo.h
trunk/lib/win64_vc14/ffmpeg/include/libavutil/audioconvert.h
trunk/lib/win64_vc14/ffmpeg/include/libavutil/avassert.h
trunk/lib/win64_vc14/ffmpeg/include/libavutil/avconfig.h
trunk/lib/win64_vc14/ffmpeg/include/libavutil/avstring.h
trunk/lib/win64_vc14/ffmpeg/include/libavutil/avutil.h
trunk/lib/win64_vc14/ffmpeg/include/libavutil/base64.h
trunk/lib/win64_vc14/ffmpeg/include/libavutil/blowfish.h
trunk/lib/win64_vc14/ffmpeg/include/libavutil/bprint.h
trunk/lib/win64_vc14/ffmpeg/include/libavutil/bswap.h
trunk/lib/win64_vc14/ffmpeg/include/libavutil/buffer.h
trunk/lib/win64_vc14/ffmpeg/include/libavutil/channel_layout.h
trunk/lib/win64_vc14/ffmpeg/include/libavutil/common.h
trunk/lib/win64_vc14/ffmpeg/include/libavutil/cpu.h
trunk/lib/win64_vc14/ffmpeg/include/libavutil/crc.h
trunk/lib/win64_vc14/ffmpeg/include/libavutil/dict.h
trunk/lib/win64_vc14/ffmpeg/include/libavutil/error.h
trunk/lib/win64_vc14/ffmpeg/include/libavutil/eval.h
trunk/lib/win64_vc14/ffmpeg/include/libavutil/fifo.h
trunk/lib/win64_vc14/ffmpeg/include/libavutil/file.h
trunk/lib/win64_vc14/ffmpeg/include/libavutil/frame.h
trunk/lib/win64_vc14/ffmpeg/include/libavutil/hmac.h
trunk/lib/win64_vc14/ffmpeg/include/libavutil/imgutils.h
trunk/lib/win64_vc14/ffmpeg/include/libavutil/intfloat.h
trunk/lib/win64_vc14/ffmpeg/include/libavutil/intfloat_readwrite.h
trunk/lib/win64_vc14/ffmpeg/include/libavutil/intreadwrite.h
trunk/lib/win64_vc14/ffmpeg/include/libavutil/lfg.h
trunk/lib/win64_vc14/ffmpeg/include/libavutil/log.h
trunk/lib/win64_vc14/ffmpeg/include/libavutil/lzo.h
trunk/lib/win64_vc14/ffmpeg/include/libavutil/mathematics.h
trunk/lib/win64_vc14/ffmpeg/include/libavutil/md5.h
trunk/lib/win64_vc14/ffmpeg/include/libavutil/mem.h
trunk/lib/win64_vc14/ffmpeg/include/libavutil/murmur3.h
trunk/lib/win64_vc14/ffmpeg/include/libavutil/old_pix_fmts.h
trunk/lib/win64_vc14/ffmpeg/include/libavutil/opt.h
trunk/lib/win64_vc14/ffmpeg/include/libavutil/parseutils.h
trunk/lib/win64_vc14/ffmpeg/include/libavutil/pixdesc.h
trunk/lib/win64_vc14/ffmpeg/include/libavutil/pixfmt.h
trunk/lib/win64_vc14/ffmpeg/include/libavutil/random_seed.h
trunk/lib/win64_vc14/ffmpeg/include/libavutil/rational.h
trunk/lib/win64_vc14/ffmpeg/include/libavutil/ripemd.h
trunk/lib/win64_vc14/ffmpeg/include/libavutil/samplefmt.h
trunk/lib/win64_vc14/ffmpeg/include/libavutil/sha.h
trunk/lib/win64_vc14/ffmpeg/include/libavutil/sha512.h
trunk/lib/win64_vc14/ffmpeg/include/libavutil/time.h
trunk/lib/win64_vc14/ffmpeg/include/libavutil/timecode.h
trunk/lib/win64_vc14/ffmpeg/include/libavutil/timestamp.h
trunk/lib/win64_vc14/ffmpeg/include/libavutil/version.h
trunk/lib/win64_vc14/ffmpeg/include/libavutil/xtea.h
trunk/lib/win64_vc14/ffmpeg/include/libswscale/
trunk/lib/win64_vc14/ffmpeg/include/libswscale/swscale.h
trunk/lib/win64_vc14/ffmpeg/include/libswscale/version.h
trunk/lib/win64_vc14/ffmpeg/include/msvc/
trunk/lib/win64_vc14/ffmpeg/include/msvc/inttypes.h
trunk/lib/win64_vc14/ffmpeg/include/msvc/stdint.h
trunk/lib/win64_vc14/ffmpeg/lib/
trunk/lib/win64_vc14/ffmpeg/lib/avcodec-55.dll
trunk/lib/win64_vc14/ffmpeg/lib/avcodec-55.lib
trunk/lib/win64_vc14/ffmpeg/lib/avdevice-55.dll
trunk/lib/win64_vc14/ffmpeg/lib/avdevice-55.lib
trunk/lib/win64_vc14/ffmpeg/lib/avformat-55.dll
trunk/lib/win64_vc14/ffmpeg/lib/avformat-55.lib
trunk/lib/win64_vc14/ffmpeg/lib/avutil-52.dll
trunk/lib/win64_vc14/ffmpeg/lib/avutil-52.lib
trunk/lib/win64_vc14/ffmpeg/lib/swscale-2.dll
trunk/lib/win64_vc14/ffmpeg/lib/swscale-2.lib
Added: trunk/lib/win64_vc14/ffmpeg/Readme.txt
===================================================================
--- trunk/lib/win64_vc14/ffmpeg/Readme.txt (rev 0)
+++ trunk/lib/win64_vc14/ffmpeg/Readme.txt 2016-05-31 12:41:56 UTC (rev 61674)
@@ -0,0 +1,229 @@
+This directory contains ffmpeg library v2.1.5 from http://www.ffmpeg.org/releases/ (July 23th, 2014)
+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 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:
+ 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 64 bit mingw/msys environment: http://mingw-w64.sourceforge.net/
+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
+
+Libraries configuration scripts
+===============================
+
+ffmpeg configuration
+--------------------
+
+LIBS="/home/sergey/lib"
+VPX_VERSION="1.3.0"
+
+./configure \
+ --prefix=/home/sergey/lib/ffmpeg-2.1.4 \
+ --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-stripping \
+ --enable-runtime-cpudetect \
+ --disable-vaapi \
+ --enable-libopenjpeg \
+ --disable-nonfree \
+ --enable-gpl \
+ --disable-postproc \
+ --disable-x11grab \
+ --enable-libmp3lame \
+ --disable-librtmp \
+ --enable-libx264 \
+ --enable-libxvid \
+ --disable-libopencore-amrnb \
+ --disable-libopencore-amrwb \
+ --disable-libdc1394 \
+ --disable-version3 \
+ --disable-debug \
+ --enable-optimizations \
+ --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-${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
+-------------------
+
+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-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
+----------------------
+
+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/win64_vc14/ffmpeg/include/libavcodec/avcodec.h
===================================================================
--- trunk/lib/win64_vc14/ffmpeg/include/libavcodec/avcodec.h (rev 0)
+++ trunk/lib/win64_vc14/ffmpeg/include/libavcodec/avcodec.h 2016-05-31 12:41:56 UTC (rev 61674)
@@ -0,0 +1,5029 @@
+/*
+ * 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
+ * @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 "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
+ * @{
+ * @}
+ * @}
+ *
+ */
+
+/**
+ * @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:
+ * 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. 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 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 AVCodecID {
+ AV_CODEC_ID_NONE,
+
+ /* video codecs */
+ 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,
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list