From d9f655090a307ecc8bb3ea4a74572744090bb2d7 Mon Sep 17 00:00:00 2001
From: tobigun <tobigun@b956fd51-792f-4845-bead-9b4dfca2ff2c>
Date: Thu, 8 May 2008 15:31:55 +0000
Subject: ffmpeg update
git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@1067 b956fd51-792f-4845-bead-9b4dfca2ff2c
---
Game/Code/lib/ffmpeg/avcodec.pas | 18 +++++++++++++-----
Game/Code/lib/ffmpeg/avformat.pas | 2 +-
Game/Code/lib/ffmpeg/avutil.pas | 2 +-
3 files changed, 15 insertions(+), 7 deletions(-)
(limited to 'Game')
diff --git a/Game/Code/lib/ffmpeg/avcodec.pas b/Game/Code/lib/ffmpeg/avcodec.pas
index 3cd880c8..79bfa0b1 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.54.0, revision 12796, Sun Apr 13 07:48:43 2008 UTC
+ * Max. version: 51.56.0, revision 13019, Tue Apr 29 14:08:01 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 = 54;
+ LIBAVCODEC_MAX_VERSION_MINOR = 56;
LIBAVCODEC_MAX_VERSION_RELEASE = 0;
LIBAVCODEC_MAX_VERSION = (LIBAVCODEC_MAX_VERSION_MAJOR * VERSION_MAJOR) +
(LIBAVCODEC_MAX_VERSION_MINOR * VERSION_MINOR) +
@@ -202,6 +202,7 @@ type
CODEC_ID_8SVX_FIB,
CODEC_ID_ESCAPE124,
CODEC_ID_DIRAC,
+ CODEC_ID_BFI,
//* various PCM "codecs" */
CODEC_ID_PCM_S16LE= $10000,
@@ -251,6 +252,7 @@ type
CODEC_ID_ADPCM_IMA_EA_SEAD,
CODEC_ID_ADPCM_IMA_EA_EACS,
CODEC_ID_ADPCM_EA_XAS,
+ CODEC_ID_ADPCM_EA_MAXIS_XA,
//* AMR */
CODEC_ID_AMR_NB= $12000,
@@ -937,7 +939,7 @@ const
FF_MB_DECISION_SIMPLE = 0; ///< uses mb_cmp
FF_MB_DECISION_BITS = 1; ///< chooses the one which needs the fewest bits
- FF_MB_DECISION_RD = 2; ///< rate distoration
+ FF_MB_DECISION_RD = 2; ///< rate distortion
FF_AA_AUTO = 0;
FF_AA_FASTINT = 1; //not implemented yet
@@ -2316,8 +2318,14 @@ type
* Will be called when seeking
*)
flush: procedure (avctx: PAVCodecContext); cdecl;
- {const} supported_framerates: PAVRational; ///array of supported framerates, or NULL if any, array is terminated by {0,0}
- {const} pix_fmts: PAVPixelFormat; ///array of supported pixel formats, or NULL if unknown, array is terminanted by -1
+ {const} supported_framerates: PAVRational; ///< array of supported framerates, or NULL if any, array is terminated by {0,0}
+ {const} pix_fmts: PAVPixelFormat; ///< array of supported pixel formats, or NULL if unknown, array is terminated by -1
+ {$IF LIBAVCODEC_VERSION >= 51055000} // 51.55.0
+ {const} long_name: PChar; ///< descriptive name for the codec, meant to be more human readable than \p name
+ {$IFEND}
+ {$IF LIBAVCODEC_VERSION >= 51056000} // 51.56.0
+ {const} supported_samplerates: PInteger; ///< array of supported audio samplerates, or NULL if unknown, array is terminated by 0
+ {$IFEND}
end;
(**
diff --git a/Game/Code/lib/ffmpeg/avformat.pas b/Game/Code/lib/ffmpeg/avformat.pas
index be7dce09..6bdf4fcc 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.13.0, revision 12633, Sun Mar 30 19:17:01 2008 UTC
+ * Max. version: 52.13.0, revision 12946, Thu Apr 24 23:21:58 2008 UTC
*)
unit avformat;
diff --git a/Game/Code/lib/ffmpeg/avutil.pas b/Game/Code/lib/ffmpeg/avutil.pas
index f02faee4..ba232052 100644
--- a/Game/Code/lib/ffmpeg/avutil.pas
+++ b/Game/Code/lib/ffmpeg/avutil.pas
@@ -30,7 +30,7 @@
* revision 12501, Wed Mar 19 07:43:43 2008 UTC
*
* log.h:
- * revision 12790, Fri Apr 11 14:18:33 2008 UTC
+ * revision 13068, Tue May 6 08:41:13 2008 UTC
*)
unit avutil;
--
cgit v1.2.3