<div dir="ltr">Woops, typo. Should have been:<div><br></div><div>Upgrade FFmpeg from 0.10 to 2.1.4<br></div></div><div class="gmail_extra"><br><br><div class="gmail_quote">On Thu, Mar 27, 2014 at 4:50 PM, Sergey Sharybin <span dir="ltr"><<a href="mailto:sergey.vfx@gmail.com" target="_blank">sergey.vfx@gmail.com</a>></span> wrote:<br>
<blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Revision: 61330<br>
<a href="https://developer.blender.org/rBL61330" target="_blank">https://developer.blender.org/rBL61330</a><br>
Author: sergey<br>
Date: 2014-03-27 10:50:08 +0000 (Thu, 27 Mar 2014)<br>
Log Message:<br>
-----------<br>
Windows 32bit vc2013: Uprade FFmpeg from 0.10 to 2.1.3<br>
<br>
Modified Paths:<br>
--------------<br>
trunk/lib/windows_vc12/ffmpeg/Readme.txt<br>
trunk/lib/windows_vc12/ffmpeg/include/libavcodec/avcodec.h<br>
trunk/lib/windows_vc12/ffmpeg/include/libavcodec/avfft.h<br>
trunk/lib/windows_vc12/ffmpeg/include/libavcodec/dxva2.h<br>
trunk/lib/windows_vc12/ffmpeg/include/libavcodec/vaapi.h<br>
trunk/lib/windows_vc12/ffmpeg/include/libavcodec/vda.h<br>
trunk/lib/windows_vc12/ffmpeg/include/libavcodec/vdpau.h<br>
trunk/lib/windows_vc12/ffmpeg/include/libavcodec/version.h<br>
trunk/lib/windows_vc12/ffmpeg/include/libavcodec/xvmc.h<br>
trunk/lib/windows_vc12/ffmpeg/include/libavdevice/avdevice.h<br>
trunk/lib/windows_vc12/ffmpeg/include/libavformat/avformat.h<br>
trunk/lib/windows_vc12/ffmpeg/include/libavformat/avio.h<br>
trunk/lib/windows_vc12/ffmpeg/include/libavformat/version.h<br>
trunk/lib/windows_vc12/ffmpeg/include/libavutil/adler32.h<br>
trunk/lib/windows_vc12/ffmpeg/include/libavutil/aes.h<br>
trunk/lib/windows_vc12/ffmpeg/include/libavutil/attributes.h<br>
trunk/lib/windows_vc12/ffmpeg/include/libavutil/audioconvert.h<br>
trunk/lib/windows_vc12/ffmpeg/include/libavutil/avassert.h<br>
trunk/lib/windows_vc12/ffmpeg/include/libavutil/avconfig.h<br>
trunk/lib/windows_vc12/ffmpeg/include/libavutil/avstring.h<br>
trunk/lib/windows_vc12/ffmpeg/include/libavutil/avutil.h<br>
trunk/lib/windows_vc12/ffmpeg/include/libavutil/base64.h<br>
trunk/lib/windows_vc12/ffmpeg/include/libavutil/common.h<br>
trunk/lib/windows_vc12/ffmpeg/include/libavutil/cpu.h<br>
trunk/lib/windows_vc12/ffmpeg/include/libavutil/crc.h<br>
trunk/lib/windows_vc12/ffmpeg/include/libavutil/dict.h<br>
trunk/lib/windows_vc12/ffmpeg/include/libavutil/error.h<br>
trunk/lib/windows_vc12/ffmpeg/include/libavutil/eval.h<br>
trunk/lib/windows_vc12/ffmpeg/include/libavutil/fifo.h<br>
trunk/lib/windows_vc12/ffmpeg/include/libavutil/file.h<br>
trunk/lib/windows_vc12/ffmpeg/include/libavutil/imgutils.h<br>
trunk/lib/windows_vc12/ffmpeg/include/libavutil/intreadwrite.h<br>
trunk/lib/windows_vc12/ffmpeg/include/libavutil/lfg.h<br>
trunk/lib/windows_vc12/ffmpeg/include/libavutil/log.h<br>
trunk/lib/windows_vc12/ffmpeg/include/libavutil/lzo.h<br>
trunk/lib/windows_vc12/ffmpeg/include/libavutil/mathematics.h<br>
trunk/lib/windows_vc12/ffmpeg/include/libavutil/md5.h<br>
trunk/lib/windows_vc12/ffmpeg/include/libavutil/mem.h<br>
trunk/lib/windows_vc12/ffmpeg/include/libavutil/opt.h<br>
trunk/lib/windows_vc12/ffmpeg/include/libavutil/parseutils.h<br>
trunk/lib/windows_vc12/ffmpeg/include/libavutil/pixdesc.h<br>
trunk/lib/windows_vc12/ffmpeg/include/libavutil/pixfmt.h<br>
trunk/lib/windows_vc12/ffmpeg/include/libavutil/rational.h<br>
trunk/lib/windows_vc12/ffmpeg/include/libavutil/samplefmt.h<br>
trunk/lib/windows_vc12/ffmpeg/include/libavutil/sha.h<br>
trunk/lib/windows_vc12/ffmpeg/include/libswscale/swscale.h<br>
trunk/lib/windows_vc12/ffmpeg/lib/swscale-2.dll<br>
trunk/lib/windows_vc12/ffmpeg/lib/swscale-2.lib<br>
<br>
Added Paths:<br>
-----------<br>
trunk/lib/windows_vc12/ffmpeg/include/libavcodec/old_codec_ids.h<br>
trunk/lib/windows_vc12/ffmpeg/include/libavdevice/version.h<br>
trunk/lib/windows_vc12/ffmpeg/include/libavutil/audio_fifo.h<br>
trunk/lib/windows_vc12/ffmpeg/include/libavutil/blowfish.h<br>
trunk/lib/windows_vc12/ffmpeg/include/libavutil/bprint.h<br>
trunk/lib/windows_vc12/ffmpeg/include/libavutil/buffer.h<br>
trunk/lib/windows_vc12/ffmpeg/include/libavutil/channel_layout.h<br>
trunk/lib/windows_vc12/ffmpeg/include/libavutil/frame.h<br>
trunk/lib/windows_vc12/ffmpeg/include/libavutil/hmac.h<br>
trunk/lib/windows_vc12/ffmpeg/include/libavutil/intfloat.h<br>
trunk/lib/windows_vc12/ffmpeg/include/libavutil/murmur3.h<br>
trunk/lib/windows_vc12/ffmpeg/include/libavutil/old_pix_fmts.h<br>
trunk/lib/windows_vc12/ffmpeg/include/libavutil/ripemd.h<br>
trunk/lib/windows_vc12/ffmpeg/include/libavutil/sha512.h<br>
trunk/lib/windows_vc12/ffmpeg/include/libavutil/time.h<br>
trunk/lib/windows_vc12/ffmpeg/include/libavutil/timecode.h<br>
trunk/lib/windows_vc12/ffmpeg/include/libavutil/timestamp.h<br>
trunk/lib/windows_vc12/ffmpeg/include/libavutil/version.h<br>
trunk/lib/windows_vc12/ffmpeg/include/libavutil/xtea.h<br>
trunk/lib/windows_vc12/ffmpeg/include/libswscale/version.h<br>
trunk/lib/windows_vc12/ffmpeg/lib/avcodec-55.dll<br>
trunk/lib/windows_vc12/ffmpeg/lib/avcodec-55.lib<br>
trunk/lib/windows_vc12/ffmpeg/lib/avdevice-55.dll<br>
trunk/lib/windows_vc12/ffmpeg/lib/avdevice-55.lib<br>
trunk/lib/windows_vc12/ffmpeg/lib/avformat-55.dll<br>
trunk/lib/windows_vc12/ffmpeg/lib/avformat-55.lib<br>
trunk/lib/windows_vc12/ffmpeg/lib/avutil-52.dll<br>
trunk/lib/windows_vc12/ffmpeg/lib/avutil-52.lib<br>
<br>
Removed Paths:<br>
-------------<br>
trunk/lib/windows_vc12/ffmpeg/include/libavcodec/opt.h<br>
trunk/lib/windows_vc12/ffmpeg/lib/avcodec-53.dll<br>
trunk/lib/windows_vc12/ffmpeg/lib/avcodec-53.lib<br>
trunk/lib/windows_vc12/ffmpeg/lib/avdevice-53.dll<br>
trunk/lib/windows_vc12/ffmpeg/lib/avdevice-53.lib<br>
trunk/lib/windows_vc12/ffmpeg/lib/avformat-53.dll<br>
trunk/lib/windows_vc12/ffmpeg/lib/avformat-53.lib<br>
trunk/lib/windows_vc12/ffmpeg/lib/avutil-51.dll<br>
trunk/lib/windows_vc12/ffmpeg/lib/avutil-51.lib<br>
<br>
Modified: trunk/lib/windows_vc12/ffmpeg/Readme.txt<br>
===================================================================<br>
--- trunk/lib/windows_vc12/ffmpeg/Readme.txt 2014-03-20 16:45:35 UTC (rev 61329)<br>
+++ trunk/lib/windows_vc12/ffmpeg/Readme.txt 2014-03-27 10:50:08 UTC (rev 61330)<br>
@@ -1,4 +1,4 @@<br>
-This directory contains ffmpeg library v0.10 from <a href="http://www.ffmpeg.org/releases/" target="_blank">http://www.ffmpeg.org/releases/</a> (January 31th, 2012)<br>
+This directory contains ffmpeg library v2.1.4 from <a href="http://www.ffmpeg.org/releases/" target="_blank">http://www.ffmpeg.org/releases/</a> (March 27th, 2014)<br>
Compiled by Sergey Sharybin in msys environment<br>
<br>
Quick notes<br>
@@ -6,7 +6,7 @@<br>
<br>
1. Compile ffmpeg libraries and copy include files and libs here<br>
2. put stdint.h and inttypes.h in subfolder msvc to prevent conflicts with mingw<br>
-3. add to libavutil\common.h after line 62<br>
+3. add to libavutil\common.h after line 67<br>
#define inline __inline<br>
4. modify stdint.h to make it compatible with MSVC C++ headers:<br>
Add signed to int8_t, int16_t, int32_t, int64_t:<br>
@@ -23,8 +23,7 @@<br>
<br>
1. Used 32 bit mingw/msys environment using this installer:<br>
<a href="http://sourceforge.net/projects/mingw/files/Automated%20MinGW%20Installer/mingw-get-inst
-2" target="_blank">http://sourceforge.net/projects/mingw/files/Automated%20MinGW%20Installer/mingw-get-inst<br>
-2</a>. Used gcc-4.4.0 due to some incompatibilities between used libraries and newer compilers<br>
- <a href="http://sourceforge.net/projects/mingw/files/MinGW/BaseSystem/GCC/Version4/Previous%20Release%20gcc-4.4.0/" target="_blank">http://sourceforge.net/projects/mingw/files/MinGW/BaseSystem/GCC/Version4/Previous%20Release%20gcc-4.4.0/</a><br>
+2. Used gcc-4.7.1<br>
3. Also used yasm: <a href="http://www.tortall.net/projects/yasm/wiki/Download" target="_blank">http://www.tortall.net/projects/yasm/wiki/Download</a><br>
4. Used pthread library frmo mingw-w64 sourceforge files download page<br>
<br>
@@ -35,9 +34,11 @@<br>
--------------------<br>
<br>
LIBS="/home/sergey/lib"<br>
+VPX_VERSION="1.3.0"<br>
<br>
./configure \<br>
- --prefix=/home/sergey/lib/ffmpeg-0.10 \<br>
+ --cpu=i486 \<br>
+ --prefix=/home/sergey/lib/ffmpeg-2.1.4 \<br>
--enable-shared \<br>
--disable-static \<br>
--disable-avfilter \<br>
@@ -58,7 +59,6 @@<br>
--enable-gpl \<br>
--disable-postproc \<br>
--disable-x11grab \<br>
- --enable-libdirac \<br>
--enable-libmp3lame \<br>
--disable-librtmp \<br>
--enable-libx264 \<br>
@@ -69,13 +69,13 @@<br>
--disable-version3 \<br>
--disable-debug \<br>
--enable-optimizations \<br>
- --enable-ffplay \<br>
--disable-sse \<br>
--disable-ssse3 \<br>
+ --enable-ffplay \<br>
--enable-w32threads \<br>
--disable-pthreads \<br>
- --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}/zlib/include" \<br>
- --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}/zlib/lib"<br>
+ --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" \<br>
+ --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"<br>
<br>
dirac configuration<br>
-------------------<br>
@@ -156,14 +156,21 @@<br>
libvpx configuration<br>
--------------------<br>
<br>
-export CFLAGS="-g -Wall -Wextra"<br>
-export LDFLAGS="-Wl,--as-needed -static-libgcc"<br>
+#export CFLAGS="-g -Wall -Wextra"<br>
+#export LDFLAGS="-Wl,--as-needed -static-libgcc"<br>
<br>
./configure \<br>
- --prefix=/home/sergey/lib/vpx \<br>
+ --prefix=/home/sergey/lib/vpx-1.3.0 \<br>
--disable-shared \<br>
--disable-install-bins \<br>
--disable-install-srcs \<br>
+ --disable-sse4_1 \<br>
+ --disable-sse3 \<br>
+ --disable-ssse3 \<br>
+ --disable-avx \<br>
+ --disable-avx2 \<br>
+ --disable-unit-tests \<br>
+ --disable-examples \<br>
--extra-cflags="-g -Wall -Wextra"<br>
<br>
openjpeg configuration<br>
<br>
Modified: trunk/lib/windows_vc12/ffmpeg/include/libavcodec/avcodec.h<br>
===================================================================<br>
--- trunk/lib/windows_vc12/ffmpeg/include/libavcodec/avcodec.h 2014-03-20 16:45:35 UTC (rev 61329)<br>
+++ trunk/lib/windows_vc12/ffmpeg/include/libavcodec/avcodec.h 2014-03-27 10:50:08 UTC (rev 61330)<br>
@@ -23,19 +23,25 @@<br>
<br>
/**<br>
* @file<br>
- * external API header<br>
+ * @ingroup libavc<br>
+ * Libavcodec external API header<br>
*/<br>
<br>
#include <errno.h><br>
#include "libavutil/samplefmt.h"<br>
+#include "libavutil/attributes.h"<br>
#include "libavutil/avutil.h"<br>
+#include "libavutil/buffer.h"<br>
#include "libavutil/cpu.h"<br>
+#include "libavutil/channel_layout.h"<br>
#include "libavutil/dict.h"<br>
+#include "libavutil/frame.h"<br>
#include "libavutil/log.h"<br>
#include "libavutil/pixfmt.h"<br>
#include "libavutil/rational.h"<br>
<br>
-#include "libavcodec/version.h"<br>
+#include "version.h"<br>
+<br>
/**<br>
* @defgroup libavc Encoding/Decoding Library<br>
* @{<br>
@@ -67,7 +73,16 @@<br>
*<br>
*/<br>
<br>
+/**<br>
+ * @defgroup lavc_core Core functions/structures.<br>
+ * @ingroup libavc<br>
+ *<br>
+ * Basic definitions, functions for querying libavcodec capabilities,<br>
+ * allocating core structures, etc.<br>
+ * @{<br>
+ */<br>
<br>
+<br>
/**<br>
* Identify the syntax and semantics of the bitstream.<br>
* The principle is roughly:<br>
@@ -79,434 +94,483 @@<br>
* If you add a codec ID to this list, add it so that<br>
* 1. no value of a existing codec ID changes (that would break ABI),<br>
* 2. Give it a value which when taken as ASCII is recognized uniquely by a human as this specific codec.<br>
- * This ensures that 2 forks can independantly add CodecIDs without producing conflicts.<br>
+ * This ensures that 2 forks can independently add AVCodecIDs without producing conflicts.<br>
+ *<br>
+ * After adding new codec IDs, do not forget to add an entry to the codec<br>
+ * descriptor list and bump libavcodec minor version.<br>
*/<br>
-enum CodecID {<br>
- CODEC_ID_NONE,<br>
+enum AVCodecID {<br>
+ AV_CODEC_ID_NONE,<br>
<br>
/* video codecs */<br>
- CODEC_ID_MPEG1VIDEO,<br>
- CODEC_ID_MPEG2VIDEO, ///< preferred ID for MPEG-1/2 video decoding<br>
- CODEC_ID_MPEG2VIDEO_XVMC,<br>
- CODEC_ID_H261,<br>
- CODEC_ID_H263,<br>
- CODEC_ID_RV10,<br>
- CODEC_ID_RV20,<br>
- CODEC_ID_MJPEG,<br>
- CODEC_ID_MJPEGB,<br>
- CODEC_ID_LJPEG,<br>
- CODEC_ID_SP5X,<br>
- CODEC_ID_JPEGLS,<br>
- CODEC_ID_MPEG4,<br>
- CODEC_ID_RAWVIDEO,<br>
- CODEC_ID_MSMPEG4V1,<br>
- CODEC_ID_MSMPEG4V2,<br>
- CODEC_ID_MSMPEG4V3,<br>
- CODEC_ID_WMV1,<br>
- CODEC_ID_WMV2,<br>
- CODEC_ID_H263P,<br>
- CODEC_ID_H263I,<br>
- CODEC_ID_FLV1,<br>
- CODEC_ID_SVQ1,<br>
- CODEC_ID_SVQ3,<br>
- CODEC_ID_DVVIDEO,<br>
- CODEC_ID_HUFFYUV,<br>
- CODEC_ID_CYUV,<br>
- CODEC_ID_H264,<br>
- CODEC_ID_INDEO3,<br>
- CODEC_ID_VP3,<br>
- CODEC_ID_THEORA,<br>
- CODEC_ID_ASV1,<br>
- CODEC_ID_ASV2,<br>
- CODEC_ID_FFV1,<br>
- CODEC_ID_4XM,<br>
- CODEC_ID_VCR1,<br>
- CODEC_ID_CLJR,<br>
- CODEC_ID_MDEC,<br>
- CODEC_ID_ROQ,<br>
- CODEC_ID_INTERPLAY_VIDEO,<br>
- CODEC_ID_XAN_WC3,<br>
- CODEC_ID_XAN_WC4,<br>
- CODEC_ID_RPZA,<br>
- CODEC_ID_CINEPAK,<br>
- CODEC_ID_WS_VQA,<br>
- CODEC_ID_MSRLE,<br>
- CODEC_ID_MSVIDEO1,<br>
- CODEC_ID_IDCIN,<br>
- CODEC_ID_8BPS,<br>
- CODEC_ID_SMC,<br>
- CODEC_ID_FLIC,<br>
- CODEC_ID_TRUEMOTION1,<br>
- CODEC_ID_VMDVIDEO,<br>
- CODEC_ID_MSZH,<br>
- CODEC_ID_ZLIB,<br>
- CODEC_ID_QTRLE,<br>
- CODEC_ID_SNOW,<br>
- CODEC_ID_TSCC,<br>
- CODEC_ID_ULTI,<br>
- CODEC_ID_QDRAW,<br>
- CODEC_ID_VIXL,<br>
- CODEC_ID_QPEG,<br>
- CODEC_ID_PNG,<br>
- CODEC_ID_PPM,<br>
- CODEC_ID_PBM,<br>
- CODEC_ID_PGM,<br>
- CODEC_ID_PGMYUV,<br>
- CODEC_ID_PAM,<br>
- CODEC_ID_FFVHUFF,<br>
- CODEC_ID_RV30,<br>
- CODEC_ID_RV40,<br>
- CODEC_ID_VC1,<br>
- CODEC_ID_WMV3,<br>
- CODEC_ID_LOCO,<br>
- CODEC_ID_WNV1,<br>
- CODEC_ID_AASC,<br>
- CODEC_ID_INDEO2,<br>
- CODEC_ID_FRAPS,<br>
- CODEC_ID_TRUEMOTION2,<br>
- CODEC_ID_BMP,<br>
- CODEC_ID_CSCD,<br>
- CODEC_ID_MMVIDEO,<br>
- CODEC_ID_ZMBV,<br>
- CODEC_ID_AVS,<br>
- CODEC_ID_SMACKVIDEO,<br>
- CODEC_ID_NUV,<br>
- CODEC_ID_KMVC,<br>
- CODEC_ID_FLASHSV,<br>
- CODEC_ID_CAVS,<br>
- CODEC_ID_JPEG2000,<br>
- CODEC_ID_VMNC,<br>
- CODEC_ID_VP5,<br>
- CODEC_ID_VP6,<br>
- CODEC_ID_VP6F,<br>
- CODEC_ID_TARGA,<br>
- CODEC_ID_DSICINVIDEO,<br>
- CODEC_ID_TIERTEXSEQVIDEO,<br>
- CODEC_ID_TIFF,<br>
- CODEC_ID_GIF,<br>
-#if LIBAVCODEC_VERSION_MAJOR == 53<br>
- CODEC_ID_FFH264,<br>
-#endif<br>
- CODEC_ID_DXA,<br>
- CODEC_ID_DNXHD,<br>
- CODEC_ID_THP,<br>
- CODEC_ID_SGI,<br>
- CODEC_ID_C93,<br>
- CODEC_ID_BETHSOFTVID,<br>
- CODEC_ID_PTX,<br>
- CODEC_ID_TXD,<br>
- CODEC_ID_VP6A,<br>
- CODEC_ID_AMV,<br>
- CODEC_ID_VB,<br>
- CODEC_ID_PCX,<br>
- CODEC_ID_SUNRAST,<br>
- CODEC_ID_INDEO4,<br>
- CODEC_ID_INDEO5,<br>
- CODEC_ID_MIMIC,<br>
- CODEC_ID_RL2,<br>
-#if LIBAVCODEC_VERSION_MAJOR == 53<br>
- CODEC_ID_8SVX_EXP,<br>
- CODEC_ID_8SVX_FIB,<br>
-#endif<br>
- CODEC_ID_ESCAPE124,<br>
- CODEC_ID_DIRAC,<br>
- CODEC_ID_BFI,<br>
- CODEC_ID_CMV,<br>
- CODEC_ID_MOTIONPIXELS,<br>
- CODEC_ID_TGV,<br>
- CODEC_ID_TGQ,<br>
- CODEC_ID_TQI,<br>
- CODEC_ID_AURA,<br>
- CODEC_ID_AURA2,<br>
- CODEC_ID_V210X,<br>
- CODEC_ID_TMV,<br>
- CODEC_ID_V210,<br>
- CODEC_ID_DPX,<br>
- CODEC_ID_MAD,<br>
- CODEC_ID_FRWU,<br>
- CODEC_ID_FLASHSV2,<br>
- CODEC_ID_CDGRAPHICS,<br>
- CODEC_ID_R210,<br>
- CODEC_ID_ANM,<br>
- CODEC_ID_BINKVIDEO,<br>
- CODEC_ID_IFF_ILBM,<br>
- CODEC_ID_IFF_BYTERUN1,<br>
- CODEC_ID_KGV1,<br>
- CODEC_ID_YOP,<br>
- CODEC_ID_VP8,<br>
- CODEC_ID_PICTOR,<br>
- CODEC_ID_ANSI,<br>
- CODEC_ID_A64_MULTI,<br>
- CODEC_ID_A64_MULTI5,<br>
- CODEC_ID_R10K,<br>
- CODEC_ID_MXPEG,<br>
- CODEC_ID_LAGARITH,<br>
- CODEC_ID_PRORES,<br>
- CODEC_ID_JV,<br>
- CODEC_ID_DFA,<br>
- CODEC_ID_WMV3IMAGE,<br>
- CODEC_ID_VC1IMAGE,<br>
-#if LIBAVCODEC_VERSION_MAJOR == 53<br>
- CODEC_ID_G723_1_DEPRECATED,<br>
- CODEC_ID_G729_DEPRECATED,<br>
-#endif<br>
- CODEC_ID_UTVIDEO_DEPRECATED,<br>
- CODEC_ID_BMV_VIDEO,<br>
- CODEC_ID_VBLE,<br>
- CODEC_ID_DXTORY,<br>
- CODEC_ID_V410,<br>
- CODEC_ID_XWD,<br>
- CODEC_ID_Y41P = MKBETAG('Y','4','1','P'),<br>
- CODEC_ID_UTVIDEO = 0x800,<br>
- CODEC_ID_ESCAPE130 = MKBETAG('E','1','3','0'),<br>
- CODEC_ID_AVRP = MKBETAG('A','V','R','P'),<br>
+ AV_CODEC_ID_MPEG1VIDEO,<br>
+ AV_CODEC_ID_MPEG2VIDEO, ///< preferred ID for MPEG-1/2 video decoding<br>
+ AV_CODEC_ID_MPEG2VIDEO_XVMC,<br>
+ AV_CODEC_ID_H261,<br>
+ AV_CODEC_ID_H263,<br>
+ AV_CODEC_ID_RV10,<br>
+ AV_CODEC_ID_RV20,<br>
+ AV_CODEC_ID_MJPEG,<br>
+ AV_CODEC_ID_MJPEGB,<br>
+ AV_CODEC_ID_LJPEG,<br>
+ AV_CODEC_ID_SP5X,<br>
+ AV_CODEC_ID_JPEGLS,<br>
+ AV_CODEC_ID_MPEG4,<br>
+ AV_CODEC_ID_RAWVIDEO,<br>
+ AV_CODEC_ID_MSMPEG4V1,<br>
+ AV_CODEC_ID_MSMPEG4V2,<br>
+ AV_CODEC_ID_MSMPEG4V3,<br>
+ AV_CODEC_ID_WMV1,<br>
<br>
@@ Diff output truncated at 10240 characters. @@<br>
_______________________________________________<br>
Bf-blender-cvs mailing list<br>
<a href="mailto:Bf-blender-cvs@blender.org">Bf-blender-cvs@blender.org</a><br>
<a href="http://lists.blender.org/mailman/listinfo/bf-blender-cvs" target="_blank">http://lists.blender.org/mailman/listinfo/bf-blender-cvs</a><br>
</blockquote></div><br><br clear="all"><div><br></div>-- <br><div><span style="color:rgb(102,102,102)">With best regards, Sergey Sharybin</span></div>
</div>