compatibility with the current svn-version

git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@837 b956fd51-792f-4845-bead-9b4dfca2ff2c

8 files changed, 56 insertions, 22 deletions

diff --git a/Game/Code/lib/ffmpeg/avcodec.pas b/Game/Code/lib/ffmpeg/avcodec.pas
index dffe284e..cdb9b7d4 100644
--- a/Game/Code/lib/ffmpeg/avcodec.pas
+++ b/Game/Code/lib/ffmpeg/avcodec.pas
@@ -21,8 +21,10 @@
  * For Mac OS X, some modifications were made by The Creative CAT, denoted as CAT
  * in the source codes *)
 
-// Min. version: 51.16.0
-// Max. version: 51.49.0, Revision: 11352
+(*
+ * Min. version: 51.16.0
+ * Max. version: 51.50.0, Revision: 11878, Wed Feb 6 12:37:37 2008 UTC
+ *)
 
 unit avcodec;
 
@@ -45,7 +47,7 @@ uses
 const
   (* Max. supported version by this header *)
   LIBAVCODEC_MAX_VERSION_MAJOR   = 51;
-  LIBAVCODEC_MAX_VERSION_MINOR   = 49;
+  LIBAVCODEC_MAX_VERSION_MINOR   = 50;
   LIBAVCODEC_MAX_VERSION_RELEASE = 0;
   LIBAVCODEC_MAX_VERSION = (LIBAVCODEC_MAX_VERSION_MAJOR * VERSION_MAJOR) +
                            (LIBAVCODEC_MAX_VERSION_MINOR * VERSION_MINOR) +
@@ -295,6 +297,7 @@ type
     CODEC_ID_APE,
     CODEC_ID_NELLYMOSER,
     CODEC_ID_MUSEPACK8,
+    CODEC_ID_SPEEX,
 
     //* subtitle codecs */
     CODEC_ID_DVD_SUBTITLE= $17000,
@@ -302,18 +305,22 @@ type
     CODEC_ID_TEXT,  ///< raw UTF-8 text
     CODEC_ID_XSUB,
     CODEC_ID_SSA,
+    CODEC_ID_MOV_TEXT,
 
+    (* other specific kind of codecs (generaly used for attachments) *)
+    CODEC_ID_TTF= $18000,
+    
     CODEC_ID_MPEG2TS= $20000, {*< _FAKE_ codec to indicate a raw MPEG-2 TS
                               * stream (only used by libavformat) *}
     __CODEC_ID_4BYTE = $FFFFF  // ensure 4-byte enum
   );
 
+{$IF LIBAVCODEC_VERSION < 52000000} // 52.0.0
 {* CODEC_ID_MP3LAME is obsolete *}
 const
-  {$IF LIBAVCODEC_VERSION < 52000000} // 52.0.0
   CODEC_ID_MP3LAME = CODEC_ID_MP3;
   CODEC_ID_MPEG4AAC = CODEC_ID_AAC;
-  {$IFEND}
+{$IFEND}
 
 type
   TCodecType = (
@@ -322,6 +329,7 @@ type
     CODEC_TYPE_AUDIO,
     CODEC_TYPE_DATA,
     CODEC_TYPE_SUBTITLE,
+    CODEC_TYPE_ATTACHMENT,
 	  CODEC_TYPE_NB
   );
 
@@ -2277,7 +2285,7 @@ type
     encode: function (avctx: PAVCodecContext; buf: pchar; buf_size: integer; data: pointer): integer; cdecl;
     close: function (avctx: PAVCodecContext): integer; cdecl;
     decode: function (avctx: PAVCodecContext; outdata: pointer; outdata_size: PInteger;
-                  buf: pchar; buf_size: integer): integer; cdecl;
+                  {const} buf: pchar; buf_size: integer): integer; cdecl;
     capabilities: integer;
     next: PAVCodec;
     flush: procedure (avctx: PAVCodecContext); cdecl;
@@ -2748,7 +2756,7 @@ function avcodec_open (avctx: PAVCodecContext; codec: PAVCodec): integer;
  *)
 function avcodec_decode_audio (avctx: PAVCodecContext; samples: Pword;
                            var frame_size_ptr: integer;
-                           buf: pchar; buf_size: integer): integer;
+                           {const} buf: pchar; buf_size: integer): integer;
   cdecl; external av__codec;
 
 {$IF LIBAVCODEC_VERSION >= 51030000} // 51.30.0
@@ -2790,7 +2798,7 @@ function avcodec_decode_audio (avctx: PAVCodecContext; samples: Pword;
  *)
 function avcodec_decode_audio2(avctx : PAVCodecContext; samples : PSmallint;
                var frame_size_ptr : integer;
-               buf: pchar; buf_size: integer): integer;
+               {const} buf: pchar; buf_size: integer): integer;
   cdecl; external av__codec;
 {$IFEND}
 
@@ -2827,7 +2835,7 @@ function avcodec_decode_audio2(avctx : PAVCodecContext; samples : PSmallint;
  *)
 function avcodec_decode_video (avctx: PAVCodecContext; picture: PAVFrame;
                        var got_picture_ptr: integer;
-                       buf: PByte; buf_size: integer): integer;
+                       {const} buf: PByte; buf_size: integer): integer;
   cdecl; external av__codec;
 
 (* Decode a subtitle message. Return -1 if error, otherwise return the
diff --git a/Game/Code/lib/ffmpeg/avformat.pas b/Game/Code/lib/ffmpeg/avformat.pas
index 41d964bb..7a5678a5 100644
--- a/Game/Code/lib/ffmpeg/avformat.pas
+++ b/Game/Code/lib/ffmpeg/avformat.pas
@@ -22,8 +22,10 @@
  * For Mac OS X, some modifications were made by The Creative CAT, denoted as CAT
  * in the source codes *)
 
-// Min. version: 50.5.0
-// Max. version: 52.5.0, Revision: 11574
+(*
+ * Min. version: 50.5.0
+ * Max. version: 52.7.0, Revision: 11661, Tue Jan 29 09:25:49 2008 UTC
+ *)
 
 unit avformat;
 
@@ -47,7 +49,7 @@ uses
 const
   (* Max. supported version by this header *)
   LIBAVFORMAT_MAX_VERSION_MAJOR   = 52;
-  LIBAVFORMAT_MAX_VERSION_MINOR   = 5;
+  LIBAVFORMAT_MAX_VERSION_MINOR   = 7;
   LIBAVFORMAT_MAX_VERSION_RELEASE = 0;
   LIBAVFORMAT_MAX_VERSION = (LIBAVFORMAT_MAX_VERSION_MAJOR * VERSION_MAJOR) +
                             (LIBAVFORMAT_MAX_VERSION_MINOR * VERSION_MINOR) +
@@ -439,8 +441,13 @@ type
     index_entries_allocated_size: cardinal;
 
     nb_frames: int64;                 ///< number of frames in this stream if known or 0
+    
     {$IF LIBAVFORMAT_VERSION >= 50006000} // 50.6.0
-    pts_buffer: array [0..MAX_REORDER_DELAY] of int64
+    pts_buffer: array [0..MAX_REORDER_DELAY] of int64;
+    {$IFEND}
+    
+    {$IF LIBAVFORMAT_VERSION >= 52006000} // 52.6.0
+    filename: PChar; (**< source filename of the stream *)
     {$IFEND}
   end;
 
@@ -885,7 +892,7 @@ function av_read_pause (s: PAVFormatContext): integer;
  * Free a AVFormatContext allocated by av_open_input_stream.
  * @param s context to free
  *)
-procedure av_close_input_stream(AVFormatContext *s);
+procedure av_close_input_stream(s: PAVFormatContext);
   cdecl; external av__format;
 {$IFEND}
 
diff --git a/Game/Code/lib/ffmpeg/avio.pas b/Game/Code/lib/ffmpeg/avio.pas
index d316d2b2..a4d7af12 100644
--- a/Game/Code/lib/ffmpeg/avio.pas
+++ b/Game/Code/lib/ffmpeg/avio.pas
@@ -23,7 +23,9 @@
 For Mac OS X, some modifications were made by The Creative CAT, denoted as CAT
 in the source codes *)
 
-// Revision: 11295
+(*
+ * Revision: 11305, Sat Dec 22 16:18:07 2007 UTC
+ *)
 
 unit avio;
 
@@ -198,6 +200,7 @@ function url_poll(poll_table: PURLPollEntry; n: integer; timeout: integer): inte
  * @param pause 1 for pause, 0 for resume
  *)
 function av_url_read_pause(h: PURLContext; pause: integer): integer;
+  cdecl; external av__format;
 {$IFEND}
 
 {$IF LIBAVFORMAT_VERSION >= 52001000} // 52.1.0
@@ -255,8 +258,8 @@ function av_alloc_put_byte(
                   buffer_size: integer;
                   write_flag: integer;
                   opaque: Pointer;
-                  read_packet: TReadWriteFunc,
-                  write_packet: TReadWriteFunc,
+                  read_packet: TReadWriteFunc;
+                  write_packet: TReadWriteFunc;
                   seek: TSeekFunc): PByteIOContext;
   cdecl; external av__format;
 {$IFEND}
diff --git a/Game/Code/lib/ffmpeg/avutil.pas b/Game/Code/lib/ffmpeg/avutil.pas
index d50a7871..906d9041 100644
--- a/Game/Code/lib/ffmpeg/avutil.pas
+++ b/Game/Code/lib/ffmpeg/avutil.pas
@@ -21,8 +21,14 @@
  * For Mac OS X, some modifications were made by The Creative CAT, denoted as CAT
  * in the source codes *)
 
-// Min. version: ?
-// Max. version: 49.6.0, Revision: 11207
+(*
+ * avutil.h:
+ *  Min. version: ?
+ *  Max. version: 49.6.0, Revision: 11654, Mon Jan 28 17:23:57 2008 UTC
+ *
+ * mem.h:
+ *  Revision: 11641, Sun Jan 27 20:50:16 2008 UTC
+ *)
 
 unit avutil;
 
diff --git a/Game/Code/lib/ffmpeg/mathematics.pas b/Game/Code/lib/ffmpeg/mathematics.pas
index 4ecdce8f..ae390e9d 100644
--- a/Game/Code/lib/ffmpeg/mathematics.pas
+++ b/Game/Code/lib/ffmpeg/mathematics.pas
@@ -20,7 +20,9 @@
 For Mac OS X, some modifications were made by The Creative CAT, denoted as CAT
 in the source codes *)
 
-// Revision: 10765
+(*
+ * Revision: 10765, Wed Oct 17 09:37:46 2007 UTC
+ *)
 
 unit mathematics;
 
diff --git a/Game/Code/lib/ffmpeg/opt.pas b/Game/Code/lib/ffmpeg/opt.pas
index 971ce601..6bde3e65 100644
--- a/Game/Code/lib/ffmpeg/opt.pas
+++ b/Game/Code/lib/ffmpeg/opt.pas
@@ -22,7 +22,9 @@
  * For Mac OS X, some modifications were made by The Creative CAT, denoted as CAT
  * in the source codes *)
 
-// Revision: 11250
+(*
+ * Revision: 11250, Mon Dec 17 17:41:24 2007 UTC
+ *)
 
 unit opt;
 
diff --git a/Game/Code/lib/ffmpeg/rational.pas b/Game/Code/lib/ffmpeg/rational.pas
index 14edb799..0d6f76b6 100644
--- a/Game/Code/lib/ffmpeg/rational.pas
+++ b/Game/Code/lib/ffmpeg/rational.pas
@@ -22,7 +22,9 @@
  * For Mac OS X, some modifications were made by The Creative CAT, denoted as CAT
  * in the source codes *)
 
-// Revision: 10765
+(*
+ * Revision: 10765, Wed Oct 17 09:37:46 2007 UTC
+ *)
 
 unit rational;
 
diff --git a/Game/Code/lib/ffmpeg/swscale.pas b/Game/Code/lib/ffmpeg/swscale.pas
index 9bff330a..15b2c38f 100644
--- a/Game/Code/lib/ffmpeg/swscale.pas
+++ b/Game/Code/lib/ffmpeg/swscale.pas
@@ -23,6 +23,10 @@
  *     external api for the swscale stuff
  *)
 
+(*
+ * Revision: 24800, Thu Oct 18 09:30:33 2007 UTC
+ *)
+ 
 unit swscale;
 
 {$IFDEF FPC}