aboutsummaryrefslogtreecommitdiffstats
path: root/Game/Code/lib/ffmpeg
diff options
context:
space:
mode:
authortobigun <tobigun@b956fd51-792f-4845-bead-9b4dfca2ff2c>2008-03-07 16:09:00 +0000
committertobigun <tobigun@b956fd51-792f-4845-bead-9b4dfca2ff2c>2008-03-07 16:09:00 +0000
commitb250b8f71c4265cba2142b61e1c534416f677fa1 (patch)
tree9e361ad1241c78a878b6a422abeaad938c54f7a2 /Game/Code/lib/ffmpeg
parenta1c990d681ce90156c29a6987a6276b963d3ffab (diff)
downloadusdx-b250b8f71c4265cba2142b61e1c534416f677fa1.tar.gz
usdx-b250b8f71c4265cba2142b61e1c534416f677fa1.tar.xz
usdx-b250b8f71c4265cba2142b61e1c534416f677fa1.zip
update to current SVN version
git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@931 b956fd51-792f-4845-bead-9b4dfca2ff2c
Diffstat (limited to '')
-rw-r--r--Game/Code/lib/ffmpeg/avcodec.pas28
-rw-r--r--Game/Code/lib/ffmpeg/avformat.pas2
-rw-r--r--Game/Code/lib/ffmpeg/avutil.pas4
-rw-r--r--Game/Code/lib/ffmpeg/opt.pas2
-rw-r--r--Game/Code/lib/ffmpeg/swscale.pas4
5 files changed, 24 insertions, 16 deletions
diff --git a/Game/Code/lib/ffmpeg/avcodec.pas b/Game/Code/lib/ffmpeg/avcodec.pas
index cdb9b7d4..9260f6dd 100644
--- a/Game/Code/lib/ffmpeg/avcodec.pas
+++ b/Game/Code/lib/ffmpeg/avcodec.pas
@@ -23,7 +23,7 @@
(*
* Min. version: 51.16.0
- * Max. version: 51.50.0, Revision: 11878, Wed Feb 6 12:37:37 2008 UTC
+ * Max. version: 51.51.0, revision 12352, Thu Mar 6 17:41:31 2008 UTC
*)
unit avcodec;
@@ -47,7 +47,7 @@ uses
const
(* Max. supported version by this header *)
LIBAVCODEC_MAX_VERSION_MAJOR = 51;
- LIBAVCODEC_MAX_VERSION_MINOR = 50;
+ LIBAVCODEC_MAX_VERSION_MINOR = 51;
LIBAVCODEC_MAX_VERSION_RELEASE = 0;
LIBAVCODEC_MAX_VERSION = (LIBAVCODEC_MAX_VERSION_MAJOR * VERSION_MAJOR) +
(LIBAVCODEC_MAX_VERSION_MINOR * VERSION_MINOR) +
@@ -192,6 +192,8 @@ type
CODEC_ID_VB,
CODEC_ID_PCX,
CODEC_ID_SUNRAST,
+ CODEC_ID_INDEO4,
+ CODEC_ID_INDEO5,
//* various PCM "codecs" */
CODEC_ID_PCM_S16LE= $10000,
@@ -298,6 +300,9 @@ type
CODEC_ID_NELLYMOSER,
CODEC_ID_MUSEPACK8,
CODEC_ID_SPEEX,
+ CODEC_ID_WMAVOICE,
+ CODEC_ID_WMAPRO,
+ CODEC_ID_WMALOSSLESS,
//* subtitle codecs */
CODEC_ID_DVD_SUBTITLE= $17000,
@@ -468,6 +473,7 @@ const
CODEC_FLAG2_SKIP_RD = $00004000; ///< RD optimal MB level residual skipping
CODEC_FLAG2_CHUNKS = $00008000; ///< Input bitstream might be truncated at a packet boundaries instead of only at frame boundaries.
CODEC_FLAG2_NON_LINEAR_QUANT = $00010000; ///< Use MPEG-2 nonlinear quantizer.
+ CODEC_FLAG2_BIT_RESERVOIR = $00020000; ///< Use a bit reservoir when encoding if possible
(* Unsupported options :
* Syntax Arithmetic coding (SAC)
@@ -559,12 +565,13 @@ const
FF_BUFFER_TYPE_COPY = 8; ///< just a (modified) copy of some other buffer, don't dealloc anything.
- FF_I_TYPE = 1; // Intra
- FF_P_TYPE = 2; // Predicted
- FF_B_TYPE = 3; // Bi-dir predicted
- FF_S_TYPE = 4; // S(GMC)-VOP MPEG4
- FF_SI_TYPE = 5;
- FF_SP_TYPE = 6;
+ FF_I_TYPE = 1; ///< Intra
+ FF_P_TYPE = 2; ///< Predicted
+ FF_B_TYPE = 3; ///< Bi-dir predicted
+ FF_S_TYPE = 4; ///< S(GMC)-VOP MPEG4
+ FF_SI_TYPE = 5; ///< Switching Intra
+ FF_SP_TYPE = 6; ///< Switching Predicted
+ FF_BI_TYPE = 7;
FF_BUFFER_HINTS_VALID = $01; // Buffer hints value is meaningful (if 0 ignore)
FF_BUFFER_HINTS_READABLE = $02; // Codec will read from buffer
@@ -832,6 +839,7 @@ const
FF_IDCT_SIMPLEARMV6 = 17;
FF_IDCT_SIMPLEVIS = 18;
FF_IDCT_WMV2 = 19;
+ FF_IDCT_FAAN = 20;
FF_EC_GUESS_MVS = 1;
FF_EC_DEBLOCK = 2;
@@ -968,7 +976,7 @@ type
end; {deprecated;}
type
- PAVClass = ^TAVClass;
+ PAVClass = ^TAVClass; {const}
PAVCodecContext = ^TAVCodecContext;
PAVCodec = ^TAVCodec;
@@ -1391,7 +1399,7 @@ type
* - encoding: Set by user
* - decoding: unused
*)
- rc_eq: pchar;
+ rc_eq: pchar; {const char*}
(**
* maximum bitrate
diff --git a/Game/Code/lib/ffmpeg/avformat.pas b/Game/Code/lib/ffmpeg/avformat.pas
index dd99e18b..fc2460d0 100644
--- a/Game/Code/lib/ffmpeg/avformat.pas
+++ b/Game/Code/lib/ffmpeg/avformat.pas
@@ -24,7 +24,7 @@
(*
* Min. version: 50.5.0
- * Max. version: 52.7.0, Revision: 11661, Tue Jan 29 09:25:49 2008 UTC
+ * Max. version: 52.7.0, revision 12246, Tue Feb 26 20:37:59 2008 UTC
*)
unit avformat;
diff --git a/Game/Code/lib/ffmpeg/avutil.pas b/Game/Code/lib/ffmpeg/avutil.pas
index c27dd735..dcc88809 100644
--- a/Game/Code/lib/ffmpeg/avutil.pas
+++ b/Game/Code/lib/ffmpeg/avutil.pas
@@ -24,10 +24,10 @@
(*
* avutil.h:
* Min. version: ?
- * Max. version: 49.6.0, Revision: 11654, Mon Jan 28 17:23:57 2008 UTC
+ * Max. version: revision 12246, Tue Feb 26 20:37:59 2008 UTC
*
* mem.h:
- * Revision: 11641, Sun Jan 27 20:50:16 2008 UTC
+ * revision 12218, Mon Feb 25 18:32:55 2008 UTC
*)
unit avutil;
diff --git a/Game/Code/lib/ffmpeg/opt.pas b/Game/Code/lib/ffmpeg/opt.pas
index 6bde3e65..0f94ef8e 100644
--- a/Game/Code/lib/ffmpeg/opt.pas
+++ b/Game/Code/lib/ffmpeg/opt.pas
@@ -23,7 +23,7 @@
* in the source codes *)
(*
- * Revision: 11250, Mon Dec 17 17:41:24 2007 UTC
+ * revision 12194, Mon Feb 25 09:22:11 2008 UTC
*)
unit opt;
diff --git a/Game/Code/lib/ffmpeg/swscale.pas b/Game/Code/lib/ffmpeg/swscale.pas
index 15b2c38f..bad870b7 100644
--- a/Game/Code/lib/ffmpeg/swscale.pas
+++ b/Game/Code/lib/ffmpeg/swscale.pas
@@ -24,7 +24,7 @@
*)
(*
- * Revision: 24800, Thu Oct 18 09:30:33 2007 UTC
+ * revision 26183, Thu Mar 6 11:32:25 2008 UTC
*)
unit swscale;
@@ -47,7 +47,7 @@ const
(* Max. supported version by this header *)
LIBSWSCALE_MAX_VERSION_MAJOR = 0;
LIBSWSCALE_MAX_VERSION_MINOR = 5;
- LIBSWSCALE_MAX_VERSION_RELEASE = 0;
+ LIBSWSCALE_MAX_VERSION_RELEASE = 1;
LIBSWSCALE_MAX_VERSION = (LIBSWSCALE_MAX_VERSION_MAJOR * VERSION_MAJOR) +
(LIBSWSCALE_MAX_VERSION_MINOR * VERSION_MINOR) +
(LIBSWSCALE_MAX_VERSION_RELEASE * VERSION_RELEASE);