1 files changed, 81 insertions, 21 deletions
diff --git a/Game/Code/lib/ffmpeg/opt.pas b/Game/Code/lib/ffmpeg/opt.pas
index cba2a3c8..bc46fbf2 100644
--- a/Game/Code/lib/ffmpeg/opt.pas
+++ b/Game/Code/lib/ffmpeg/opt.pas
@@ -17,14 +17,17 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  *)
 
-(* This is a part of Pascal porting of ffmpeg.
- * Originally by Victor Zinetz for Delphi and Free Pascal on Windows.
- * For Mac OS X, some modifications were made by The Creative CAT, denoted as CAT
- * in the source codes *)
+(*
+ * This is a part of Pascal porting of ffmpeg.
+ * - Originally by Victor Zinetz for Delphi and Free Pascal on Windows.
+ * - For Mac OS X, some modifications were made by The Creative CAT, denoted as CAT
+ *   in the source codes.
+ * - Changes and updates by the UltraStar Deluxe Team
+ *)
 
 (*
  * Conversion of libavcodec/opt.h
- * revision 13669, Fri Jun 6 07:00:42 2008 UTC
+ * revision 14436, Sun Jul 27 20:55:56 2008 UTC 
  *)
 
 unit opt;
@@ -78,58 +81,115 @@ type
      * @todo What about other languages?
      *)
     help: {const} PChar;
-    offset: cint;             ///< offset to context structure where the parsed value should be stored
+
+    (**
+     * 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: cdouble;
-    min: cdouble;
-    max: cdouble;
+    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} PChar;
   end;
 
 {$IF LIBAVCODEC_VERSION >= 51039000} // 51.39.0
-function av_find_opt (obj: Pointer; {const} name: {const} PChar; {const} unit_: PChar; mask: cint; flags: cint): {const} PAVOption;
+(**
+ * Looks for an option in \p obj. Looks only for the options which
+ * have the flags set as specified in \p mask and \p flags (that is,
+ * for which it is the case that opt->flags & mask == flags).
+ *
+ * @param[in] obj a pointer to a struct whose first element is a
+ * pointer to an #AVClass
+ * @param[in] name the name of the option to look for
+ * @param[in] unit the unit of the option to look for, or any if NULL
+ * @return a pointer to the option found, or NULL if no option
+ * has been found
+ *)
+function av_find_opt(obj: Pointer; {const} name: {const} PChar; {const} unit_: PChar; mask: cint; flags: cint): {const} PAVOption;
   cdecl; external av__codec;
 {$IFEND}
 
-function av_set_string (obj: pointer; name: {const} pchar; val: {const} pchar): PAVOption;
+(**
+ * @see av_set_string2()
+ *)
+function av_set_string(obj: pointer; name: {const} pchar; val: {const} pchar): {const} PAVOption;
+  cdecl; external av__codec; deprecated;
+
+{$IF LIBAVCODEC_VERSION >= 51059000} // 51.59.0
+(**
+ * Sets the field of obj with the given name to value.
+ *
+ * @param[in] obj A struct whose first element is a pointer to an
+ * AVClass.
+ * @param[in] name the name of the field to set
+ * @param[in] val The value to set. If the field is not of a string
+ * type, then the given string is parsed.
+ * SI postfixes and some named scalars are supported.
+ * If the field is of a numeric type, it has to be a numeric or named
+ * scalar. Behavior with more than one scalar and +- infix operators
+ * is undefined.
+ * If the field is of a flags type, it has to be a sequence of numeric
+ * scalars or named flags separated by '+' or '-'. Prefixing a flag
+ * with '+' causes it to be set without affecting the other flags;
+ * similarly, '-' unsets a flag.
+ * @return a pointer to the AVOption corresponding to the field set or
+ * NULL if no matching AVOption exists, or if the value \p val is not
+ * valid
+ * @param alloc when 1 then the old value will be av_freed() and the
+ *                     new av_strduped()
+ *              when 0 then no av_free() nor av_strdup() will be used
+ *)
+function av_set_string2(obj: Pointer; name: {const} PChar; val: {const} PChar; alloc: cint): {const} PAVOption;
   cdecl; external av__codec;
+{$IFEND}
 
-function av_set_double (obj: pointer; name: {const} pchar; n: cdouble): PAVOption;
+function av_set_double(obj: pointer; name: {const} pchar; n: cdouble): PAVOption;
   cdecl; external av__codec;
 
-function av_set_q (obj: pointer; name: {const} pchar; n: TAVRational): PAVOption;
+function av_set_q(obj: pointer; name: {const} pchar; n: TAVRational): PAVOption;
   cdecl; external av__codec;
 
-function av_set_int (obj: pointer; name: {const} pchar; n: cint64): PAVOption;
+function av_set_int(obj: pointer; name: {const} pchar; n: cint64): PAVOption;
   cdecl; external av__codec;
 
-function av_get_double (obj: pointer; name: {const} pchar; var o_out: PAVOption): cdouble;
+function av_get_double(obj: pointer; name: {const} pchar; var o_out: PAVOption): cdouble;
   cdecl; external av__codec;
 
-function av_get_q (obj: pointer; name: {const} pchar; var o_out: PAVOption): TAVRational;
+function av_get_q(obj: pointer; name: {const} pchar; var o_out: PAVOption): TAVRational;
   cdecl; external av__codec;
 
-function av_get_int (obj: pointer; name: {const} pchar; var o_out: {const} PAVOption): cint64;
+function av_get_int(obj: pointer; name: {const} pchar; var o_out: {const} PAVOption): cint64;
   cdecl; external av__codec;
 
-function av_get_string (obj: pointer; name: {const} pchar; var o_out: {const} PAVOption; buf: pchar; buf_len: cint): pchar;
+function av_get_string(obj: pointer; name: {const} pchar; var o_out: {const} PAVOption; buf: pchar; buf_len: cint): pchar;
   cdecl; external av__codec;
 
-function av_next_option (obj: pointer; last: {const} PAVOption): PAVOption;
+function av_next_option(obj: pointer; last: {const} PAVOption): PAVOption;
   cdecl; external av__codec;
 
-function av_opt_show (obj: pointer; av_log_obj: pointer): cint;
+function av_opt_show(obj: pointer; av_log_obj: pointer): cint;
   cdecl; external av__codec;
 
-procedure av_opt_set_defaults (s: pointer);
+procedure av_opt_set_defaults(s: pointer);
   cdecl; external av__codec;
 
 {$IF LIBAVCODEC_VERSION >= 51039000} // 51.39.0
-procedure av_opt_set_defaults2 (s: Pointer; mask: cint; flags: cint);
+procedure av_opt_set_defaults2(s: Pointer; mask: cint; flags: cint);
   cdecl; external av__codec;
 {$IFEND}