diff options
| author | k-m_schindler <k-m_schindler@b956fd51-792f-4845-bead-9b4dfca2ff2c> | 2010-05-11 22:09:10 +0000 |
|---|---|---|
| committer | k-m_schindler <k-m_schindler@b956fd51-792f-4845-bead-9b4dfca2ff2c> | 2010-05-11 22:09:10 +0000 |
| commit | ba94c02c9fcb65a6b1cd025bbadf1b0cd50f5152 (patch) | |
| tree | 91f6d715c8e20a4de21ea3d25482a26717af15cc | |
| parent | 1cdbe92fe6af0604e976e469dea881fb7e7985ed (diff) | |
| download | usdx-ba94c02c9fcb65a6b1cd025bbadf1b0cd50f5152.tar.gz usdx-ba94c02c9fcb65a6b1cd025bbadf1b0cd50f5152.tar.xz usdx-ba94c02c9fcb65a6b1cd025bbadf1b0cd50f5152.zip | |
final ffmpeg update as of today: update all to avutil 50.15.2
git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@2362 b956fd51-792f-4845-bead-9b4dfca2ff2c
| -rw-r--r-- | src/lib/ffmpeg/avcodec.pas | 12 | ||||
| -rw-r--r-- | src/lib/ffmpeg/avutil.pas | 2 | ||||
| -rw-r--r-- | src/lib/ffmpeg/mathematics.pas | 2 | ||||
| -rw-r--r-- | src/lib/ffmpeg/rational.pas | 2 |
4 files changed, 13 insertions, 5 deletions
diff --git a/src/lib/ffmpeg/avcodec.pas b/src/lib/ffmpeg/avcodec.pas index f1d7fdd3..4fa8f208 100644 --- a/src/lib/ffmpeg/avcodec.pas +++ b/src/lib/ffmpeg/avcodec.pas @@ -1236,13 +1236,21 @@ type option: PAVOption; {$IF LIBAVUTIL_VERSION >= 50015000} // 50.15.0 -{$IFEND} (** * LIBAVUTIL_VERSION with which this structure was created. - * This is used to allow fields to be added without requireing major + * This is used to allow fields to be added without requiring major * version bumps everywhere. *) version: cint; +{$IFEND} + +{$IF LIBAVUTIL_VERSION >= 50015002} // 50.15.2 + (** + * Offset in the structure where log_level_offset is stored. + * 0 means there is no such variable + *) + log_level_offset_offset: cint; +{$IFEND} end; {** diff --git a/src/lib/ffmpeg/avutil.pas b/src/lib/ffmpeg/avutil.pas index 439e6ac2..a1586def 100644 --- a/src/lib/ffmpeg/avutil.pas +++ b/src/lib/ffmpeg/avutil.pas @@ -29,7 +29,7 @@ * * libavutil/avutil.h: * Min. version: 49.0.1, revision 6577, Sat Oct 7 15:30:46 2006 UTC - * Max. version: 50.15.0, revision 22987, Tue May 11 22:05:00 2010 CET + * Max. version: 50.15.2, revision 23059, Tue May 11 22:05:00 2010 CET * * libavutil/mem.h: * revision 16590, Tue Jan 13 23:44:16 2009 UTC diff --git a/src/lib/ffmpeg/mathematics.pas b/src/lib/ffmpeg/mathematics.pas index a00969b4..3a1f6a2c 100644 --- a/src/lib/ffmpeg/mathematics.pas +++ b/src/lib/ffmpeg/mathematics.pas @@ -26,7 +26,7 @@ (* * Conversion of libavutil/mathematics.h - * avutil max. version 50.14.0, revision 22825, Tue May 11 22:10:00 2010 CET + * avutil max. version 50.15.2, revision 23059, Tue May 11 22:10:00 2010 CET * *) diff --git a/src/lib/ffmpeg/rational.pas b/src/lib/ffmpeg/rational.pas index 7faa7013..6ca9c0d1 100644 --- a/src/lib/ffmpeg/rational.pas +++ b/src/lib/ffmpeg/rational.pas @@ -27,7 +27,7 @@ (* * Conversion of libavutil/rational.h - * avutil max. version 50.9.0, revision 21946, Tue May 11 22:10:00 2010 CET + * avutil max. version 50.15.2, revision 23059, Tue May 11 22:10:00 2010 CET * *) |