first fix of ffmpeg-1.0

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

3 files changed, 91 insertions, 85 deletions

diff --git a/src/lib/ffmpeg-1.0/libavutil/cpu.pas b/src/lib/ffmpeg-1.0/libavutil/cpu.pas
index 6491cea6..ab0a7d10 100644
--- a/src/lib/ffmpeg-1.0/libavutil/cpu.pas
+++ b/src/lib/ffmpeg-1.0/libavutil/cpu.pas
@@ -102,7 +102,7 @@ function av_parse_cpu_flags(s: {const} PAnsiChar): cint;
  *
  * @return negative on error.
  *)
-function av_parse_cpu_caps(flags: Pcuint, s: {const} PAnsiChar): cint;
+function av_parse_cpu_caps(flags: Pcuint; s: {const} PAnsiChar): cint;
   cdecl; external av__util;
 
 (* The following CPU-specific functions shall not be called directly. *)
diff --git a/src/lib/ffmpeg-1.0/libavutil/log.pas b/src/lib/ffmpeg-1.0/libavutil/log.pas
index 86434b12..6ad9a02f 100644
--- a/src/lib/ffmpeg-1.0/libavutil/log.pas
+++ b/src/lib/ffmpeg-1.0/libavutil/log.pas
@@ -29,7 +29,89 @@
  *)
 
 type
-  PAVClassCategory = TAVClassCategory;
+  TAVOptionType = (
+{$IFDEF FF_API_OLD_AVOPTIONS}
+    FF_OPT_TYPE_FLAGS = 0,
+    FF_OPT_TYPE_INT,
+    FF_OPT_TYPE_INT64,
+    FF_OPT_TYPE_DOUBLE,
+    FF_OPT_TYPE_FLOAT,
+    FF_OPT_TYPE_STRING,
+    FF_OPT_TYPE_RATIONAL,
+    FF_OPT_TYPE_BINARY,  ///< offset must point to a pointer immediately followed by an int for the length
+    FF_OPT_TYPE_CONST = 128
+{$ELSE}
+    AV_OPT_TYPE_FLAGS,
+    AV_OPT_TYPE_INT,
+    AV_OPT_TYPE_INT64,
+    AV_OPT_TYPE_DOUBLE,
+    AV_OPT_TYPE_FLOAT,
+    AV_OPT_TYPE_STRING,
+    AV_OPT_TYPE_RATIONAL,
+    AV_OPT_TYPE_BINARY,  ///< offset must point to a pointer immediately followed by an int for the length
+    AV_OPT_TYPE_CONST = 128,
+    AV_OPT_TYPE_PIXEL_FMT  = $50464D54, ///< MKBETAG('P','F','M','T'),
+    AV_OPT_TYPE_IMAGE_SIZE = $53495A45  ///< MKBETAG('S','I','Z','E'), offset must point to two consecutive integers
+{$ENDIF}
+  );
+
+const
+  AV_OPT_FLAG_ENCODING_PARAM  = 1;   ///< a generic parameter which can be set by the user for muxing or encoding
+  AV_OPT_FLAG_DECODING_PARAM  = 2;   ///< a generic parameter which can be set by the user for demuxing or decoding
+  AV_OPT_FLAG_METADATA        = 4;   ///< some data extracted or inserted into the file like title, comment, ...
+  AV_OPT_FLAG_AUDIO_PARAM     = 8;
+  AV_OPT_FLAG_VIDEO_PARAM     = 16;
+  AV_OPT_FLAG_SUBTITLE_PARAM  = 32;
+  AV_OPT_FLAG_FILTERING_PARAM = 1 shl 16; ///< a generic parameter which can be set by the user for filtering
+
+type
+  (**
+   * AVOption
+   *)
+  PAVOption = ^TAVOption;
+  TAVOption = record
+    name: {const} PAnsiChar;
+    
+    (**
+     * short English help text
+     * @todo What about other languages?
+     *)
+    help: {const} PAnsiChar;
+
+    (**
+     * The offset relative to the context structure where the option
+     * value is stored. It should be 0 for named constants.
+     *)
+    offset: cint;
+    type_: TAVOptionType;
+
+    (**
+     * the default value for scalar options
+     *)
+    default_val: record
+      case cint of
+        0: (i64: cint64);
+        1: (dbl: cdouble);
+        2: (str: PAnsiChar);
+        (* TODO those are unused now *)
+        3: (q: TAVRational);
+      end;
+    min: cdouble;                ///< minimum valid value for the option
+    max: cdouble;                ///< maximum valid value for the option
+
+    flags: cint;
+//FIXME think about enc-audio, ... style flags
+
+    (**
+     * The logical unit to which the option belongs. Non-constant
+     * options and corresponding named constants share the same
+     * unit. May be NULL.
+     *)
+    unit_: {const} PAnsiChar;
+  end;
+
+type
+  PAVClassCategory = ^TAVClassCategory;
   TAVClassCategory = (
     AV_CLASS_CATEGORY_NA = 0,
     AV_CLASS_CATEGORY_INPUT,
diff --git a/src/lib/ffmpeg-1.0/libavutil/opt.pas b/src/lib/ffmpeg-1.0/libavutil/opt.pas
index 7e755942..a7a6f83d 100644
--- a/src/lib/ffmpeg-1.0/libavutil/opt.pas
+++ b/src/lib/ffmpeg-1.0/libavutil/opt.pas
@@ -27,88 +27,6 @@
  *
  *)
 
-type
-  TAVOptionType = (
-{$IFDEF FF_API_OLD_AVOPTIONS}
-    FF_OPT_TYPE_FLAGS = 0,
-    FF_OPT_TYPE_INT,
-    FF_OPT_TYPE_INT64,
-    FF_OPT_TYPE_DOUBLE,
-    FF_OPT_TYPE_FLOAT,
-    FF_OPT_TYPE_STRING,
-    FF_OPT_TYPE_RATIONAL,
-    FF_OPT_TYPE_BINARY,  ///< offset must point to a pointer immediately followed by an int for the length
-    FF_OPT_TYPE_CONST = 128
-{$ELSE}
-    AV_OPT_TYPE_FLAGS,
-    AV_OPT_TYPE_INT,
-    AV_OPT_TYPE_INT64,
-    AV_OPT_TYPE_DOUBLE,
-    AV_OPT_TYPE_FLOAT,
-    AV_OPT_TYPE_STRING,
-    AV_OPT_TYPE_RATIONAL,
-    AV_OPT_TYPE_BINARY,  ///< offset must point to a pointer immediately followed by an int for the length
-    AV_OPT_TYPE_CONST = 128,
-    AV_OPT_TYPE_PIXEL_FMT  = $50464D54, ///< MKBETAG('P','F','M','T'),
-    AV_OPT_TYPE_IMAGE_SIZE = $53495A45  ///< MKBETAG('S','I','Z','E'), offset must point to two consecutive integers
-{$ENDIF}
-  );
-
-const
-  AV_OPT_FLAG_ENCODING_PARAM  = 1;   ///< a generic parameter which can be set by the user for muxing or encoding
-  AV_OPT_FLAG_DECODING_PARAM  = 2;   ///< a generic parameter which can be set by the user for demuxing or decoding
-  AV_OPT_FLAG_METADATA        = 4;   ///< some data extracted or inserted into the file like title, comment, ...
-  AV_OPT_FLAG_AUDIO_PARAM     = 8;
-  AV_OPT_FLAG_VIDEO_PARAM     = 16;
-  AV_OPT_FLAG_SUBTITLE_PARAM  = 32;
-  AV_OPT_FLAG_FILTERING_PARAM = 1 shl 16; ///< a generic parameter which can be set by the user for filtering
-
-type
-  (**
-   * AVOption
-   *)
-  PAVOption = ^TAVOption;
-  TAVOption = record
-    name: {const} PAnsiChar;
-    
-    (**
-     * short English help text
-     * @todo What about other languages?
-     *)
-    help: {const} PAnsiChar;
-
-    (**
-     * The offset relative to the context structure where the option
-     * value is stored. It should be 0 for named constants.
-     *)
-    offset: cint;
-    type_: TAVOptionType;
-
-    (**
-     * the default value for scalar options
-     *)
-    default_val: record
-      case cint of
-        0: (i64: cint64);
-        1: (dbl: cdouble);
-        2: (str: PAnsiChar);
-        (* TODO those are unused now *)
-        3: (q: TAVRational);
-      end;
-    min: cdouble;                ///< minimum valid value for the option
-    max: cdouble;                ///< maximum valid value for the option
-
-    flags: cint;
-//FIXME think about enc-audio, ... style flags
-
-    (**
-     * The logical unit to which the option belongs. Non-constant
-     * options and corresponding named constants share the same
-     * unit. May be NULL.
-     *)
-    unit_: {const} PAnsiChar;
-  end;
-
 {$IFDEF FF_API_FIND_OPT}
 (**
  * Look for an option in obj. Look only for the options which
@@ -267,16 +185,22 @@ function av_opt_set_dict(obj: pointer; var options: PAVDictionary): cint;
  * @return 0 on success, a negative number on failure.
  *)
 function av_opt_eval_flags (obj: pointer; o: {const} PAVOption; val: {const} PAnsiChar; flags_out:  Pcint):       cint;
+  cdecl; external av__util;
 function av_opt_eval_int   (obj: pointer; o: {const} PAVOption; val: {const} PAnsiChar; int_out:    Pcint):       cint;
+  cdecl; external av__util;
 function av_opt_eval_int64 (obj: pointer; o: {const} PAVOption; val: {const} PAnsiChar; int64_out:  Pcint64):     cint;
+  cdecl; external av__util;
 function av_opt_eval_float (obj: pointer; o: {const} PAVOption; val: {const} PAnsiChar; float_out:  Pcfloat):     cint;
+  cdecl; external av__util;
 function av_opt_eval_double(obj: pointer; o: {const} PAVOption; val: {const} PAnsiChar; double_out: Pcdouble):    cint;
+  cdecl; external av__util;
 function av_opt_eval_q     (obj: pointer; o: {const} PAVOption; val: {const} PAnsiChar; q_out:      PAVRational): cint;
+  cdecl; external av__util;
 (**
  * @}
  *)
 
- const
+const
   AV_OPT_SEARCH_CHILDREN = 0001; (**< Search in possible children of the
                                       given object first.*)
 (**