check for outdated libs and some minor type corrections

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

3 files changed, 48 insertions, 9 deletions

diff --git a/Game/Code/lib/ffmpeg/avcodec.pas b/Game/Code/lib/ffmpeg/avcodec.pas
index 42bc4d9e..95f1b1d2 100644
--- a/Game/Code/lib/ffmpeg/avcodec.pas
+++ b/Game/Code/lib/ffmpeg/avcodec.pas
@@ -23,7 +23,7 @@
 
 (*
  * Conversion of libavcodec/avcodec.h
- * Min. version: 51.16.0
+ * Min. version: 51.16.0, revision 6577, Sat Oct 7 15:30:46 2006 UTC 
  * Max. version: 51.57.2, revision 13759, Thu Jun 12 21:50:13 2008 UTC
  *)
 
@@ -61,6 +61,19 @@ const
                            (LIBAVCODEC_MAX_VERSION_MINOR * VERSION_MINOR) +
                            (LIBAVCODEC_MAX_VERSION_RELEASE * VERSION_RELEASE);
 
+  (* Min. supported version by this header *)
+  LIBAVCODEC_MIN_VERSION_MAJOR   = 51;
+  LIBAVCODEC_MIN_VERSION_MINOR   = 16;
+  LIBAVCODEC_MIN_VERSION_RELEASE = 0;
+  LIBAVCODEC_MIN_VERSION = (LIBAVCODEC_MIN_VERSION_MAJOR * VERSION_MAJOR) +
+                            (LIBAVCODEC_MIN_VERSION_MINOR * VERSION_MINOR) +
+                            (LIBAVCODEC_MIN_VERSION_RELEASE * VERSION_RELEASE);
+
+(* Check if linked versions are supported *)
+{$IF (LIBAVCODEC_VERSION < LIBAVCODEC_MIN_VERSION)}
+  {$MESSAGE Error 'Linked version of libavcodec is too old!'}
+{$IFEND}
+
 (* Check if linked version is supported *)
 {$IF (LIBAVCODEC_VERSION > LIBAVCODEC_MAX_VERSION)}
   {$MESSAGE Warn 'Linked version of libavcodec may be unsupported!'}
@@ -69,7 +82,7 @@ const
 const
   AV_NOPTS_VALUE: int64   = $8000000000000000;
   AV_TIME_BASE            = 1000000;
-  AV_TIME_BASE_Q          : TAVRational = (num:1; den:AV_TIME_BASE); (* added by CAT *)
+  AV_TIME_BASE_Q          : TAVRational = (num:1; den:AV_TIME_BASE);
 
 (**
  * Identifies the syntax and semantics of the bitstream.
@@ -1810,14 +1823,14 @@ type
      * - encoding: Set by user, can be NULL.
      * - decoding: Set by libavcodec.
      *)
-    intra_matrix: Pword;
+    intra_matrix: PWord;
 
     (**
      * custom inter quantization matrix
      * - encoding: Set by user, can be NULL.
      * - decoding: Set by libavcodec.
      *)
-    inter_matrix: Pword;
+    inter_matrix: PWord;
 
     (**
      * fourcc from the AVI stream header (LSB first, so "ABCD" -> ('D'<<24) + ('C'<<16) + ('B'<<8) + 'A').
@@ -2806,7 +2819,7 @@ function avcodec_open (avctx: PAVCodecContext; codec: PAVCodec): integer;
 (**
  * @deprecated Use avcodec_decode_audio2() instead.
  *)
-function avcodec_decode_audio (avctx: PAVCodecContext; samples: Pword;
+function avcodec_decode_audio (avctx: PAVCodecContext; samples: PSmallint;
                            var frame_size_ptr: integer;
                            buf: {const} pchar; buf_size: integer): integer;
   cdecl; external av__codec;
@@ -2923,7 +2936,7 @@ function avcodec_parse_frame (avctx: PAVCodecContext; pdata: PPointer;
  * of bytes used to encode the data read from the input buffer.
  *)
 function avcodec_encode_audio (avctx: PAVCodecContext; buf: PByte;
-                      buf_size: integer; samples: {const} PWord): integer;
+                      buf_size: integer; samples: {const} PSmallint): integer;
   cdecl; external av__codec;
 
 (**
diff --git a/Game/Code/lib/ffmpeg/avformat.pas b/Game/Code/lib/ffmpeg/avformat.pas
index 730a64e4..a63510a1 100644
--- a/Game/Code/lib/ffmpeg/avformat.pas
+++ b/Game/Code/lib/ffmpeg/avformat.pas
@@ -24,7 +24,7 @@
 
 (*
  * Conversion of libavformat/avformat.h
- * Min. version: 50.5.0
+ * Min. version: 50.5.0 , revision 6577,  Sat Oct 7 15:30:46 2006 UTC
  * Max. version: 52.16.0, revision 13728, Mon Jun 9 13:38:56 2008 UTC
  *)
 
@@ -62,6 +62,19 @@ const
                             (LIBAVFORMAT_MAX_VERSION_MINOR * VERSION_MINOR) +
                             (LIBAVFORMAT_MAX_VERSION_RELEASE * VERSION_RELEASE);
 
+  (* Min. supported version by this header *)
+  LIBAVFORMAT_MIN_VERSION_MAJOR   = 50;
+  LIBAVFORMAT_MIN_VERSION_MINOR   = 5;
+  LIBAVFORMAT_MIN_VERSION_RELEASE = 0;
+  LIBAVFORMAT_MIN_VERSION = (LIBAVFORMAT_MIN_VERSION_MAJOR * VERSION_MAJOR) +
+                            (LIBAVFORMAT_MIN_VERSION_MINOR * VERSION_MINOR) +
+                            (LIBAVFORMAT_MIN_VERSION_RELEASE * VERSION_RELEASE);
+
+(* Check if linked versions are supported *)
+{$IF (LIBAVFORMAT_VERSION < LIBAVFORMAT_MIN_VERSION)}
+  {$MESSAGE Error 'Linked version of libavformat is too old!'}
+{$IFEND}
+
 (* Check if linked versions are supported *)
 {$IF (LIBAVFORMAT_VERSION > LIBAVFORMAT_MAX_VERSION)}
   {$MESSAGE Warn 'Linked version of libavformat may be unsupported!'}
diff --git a/Game/Code/lib/ffmpeg/avutil.pas b/Game/Code/lib/ffmpeg/avutil.pas
index c4b6f633..4e9990e3 100644
--- a/Game/Code/lib/ffmpeg/avutil.pas
+++ b/Game/Code/lib/ffmpeg/avutil.pas
@@ -25,8 +25,8 @@
  * Conversions of
  *
  * libavutil/avutil.h:
- *  Min. version: ?
- *  Max. version: revision 13595, Sun Jun 1 07:37:43 2008 UTC
+ *  Min. version: 49.0.1, revision 6577,  Sat Oct 7 15:30:46 2006 UTC
+ *  Max. version: 49.7.0, revision 13595, Sun Jun 1 07:37:43 2008 UTC
  *
  * libavutil/mem.h:
  *  revision 13665, Thu Jun 5 19:49:47 2008 UTC
@@ -65,11 +65,24 @@ const
                           (LIBAVUTIL_MAX_VERSION_MINOR * VERSION_MINOR) +
                           (LIBAVUTIL_MAX_VERSION_RELEASE * VERSION_RELEASE);
 
+  (* Min. supported version by this header *)
+  LIBAVUTIL_MIN_VERSION_MAJOR   = 49;
+  LIBAVUTIL_MIN_VERSION_MINOR   = 0;
+  LIBAVUTIL_MIN_VERSION_RELEASE = 1;
+  LIBAVUTIL_MIN_VERSION = (LIBAVUTIL_MIN_VERSION_MAJOR * VERSION_MAJOR) +
+                          (LIBAVUTIL_MIN_VERSION_MINOR * VERSION_MINOR) +
+                          (LIBAVUTIL_MIN_VERSION_RELEASE * VERSION_RELEASE);
+
 (* Check if linked versions are supported *)
+{$IF (LIBAVUTIL_VERSION < LIBAVUTIL_MIN_VERSION)}
+  {$MESSAGE Error 'Linked version of libavutil is too old!'}
+{$IFEND}
+
 {$IF (LIBAVUTIL_VERSION > LIBAVUTIL_MAX_VERSION)}
   {$MESSAGE Warn 'Linked version of libavutil may be unsupported!'}
 {$IFEND}
 
+
 {$IFDEF FPC}
 {$IF FPC_VERSION_INT < 2002000} // < 2.2.0
 type