FFmpeg update

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

8 files changed, 209 insertions, 78 deletions

diff --git a/Game/Code/lib/ffmpeg/avcodec.pas b/Game/Code/lib/ffmpeg/avcodec.pas
index e1e9476a..e319ccb9 100644
--- a/Game/Code/lib/ffmpeg/avcodec.pas
+++ b/Game/Code/lib/ffmpeg/avcodec.pas
@@ -16,15 +16,18 @@
  * Foundation, Inc., 51 Franklin St, 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/avcodec.h
  * 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
+ * Max. version: 51.63.0, revision 14666, Fri Aug 8 18:34:27 2008 UTC 
  *)
 
 unit avcodec;
@@ -56,8 +59,8 @@ uses
 const
   (* Max. supported version by this header *)
   LIBAVCODEC_MAX_VERSION_MAJOR   = 51;
-  LIBAVCODEC_MAX_VERSION_MINOR   = 57;
-  LIBAVCODEC_MAX_VERSION_RELEASE = 2;
+  LIBAVCODEC_MAX_VERSION_MINOR   = 63;
+  LIBAVCODEC_MAX_VERSION_RELEASE = 0;
   LIBAVCODEC_MAX_VERSION = (LIBAVCODEC_MAX_VERSION_MAJOR * VERSION_MAJOR) +
                            (LIBAVCODEC_MAX_VERSION_MINOR * VERSION_MINOR) +
                            (LIBAVCODEC_MAX_VERSION_RELEASE * VERSION_RELEASE);
@@ -225,6 +228,9 @@ type
     CODEC_ID_ESCAPE124,
     CODEC_ID_DIRAC,
     CODEC_ID_BFI,
+    CODEC_ID_CMV,
+    CODEC_ID_MOTIONPIXELS,
+    CODEC_ID_TGV,
 
     //* various PCM "codecs" */
     CODEC_ID_PCM_S16LE= $10000,
@@ -247,6 +253,7 @@ type
     CODEC_ID_PCM_ZORK,
     CODEC_ID_PCM_S16LE_PLANAR,
     CODEC_ID_PCM_DVD,
+    CODEC_ID_PCM_F32BE,
 
     //* various ADPCM codecs */
     CODEC_ID_ADPCM_IMA_QT= $11000,
@@ -349,7 +356,9 @@ type
 
     (* other specific kind of codecs (generally used for attachments) *)
     CODEC_ID_TTF= $18000,
-    
+
+    CODEC_ID_PROBE= $19000, ///< codec_id is not known (like CODEC_ID_NONE) but lavf should attempt to identify it
+
     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
@@ -384,8 +393,11 @@ type
     SAMPLE_FMT_S16,             ///< signed 16 bits
     SAMPLE_FMT_S24,             ///< signed 24 bits
     SAMPLE_FMT_S32,             ///< signed 32 bits
-    SAMPLE_FMT_FLT              ///< float
+    SAMPLE_FMT_FLT,             ///< float
+    SAMPLE_FMT_NB               ///< Number of sample formats. DO NOT USE if dynamically linking to libavcodec
   );
+  _TSampleFormatArray = array [0 .. MaxInt div SizeOf(TSampleFormat)-1] of TSampleFormat;
+  PSampleFormatArray = ^_TSampleFormatArray;
 
 const
   {* in bytes *}
@@ -915,6 +927,7 @@ const
   FF_DEBUG_BUGS         = $00001000;
   FF_DEBUG_VIS_QP       = $00002000;
   FF_DEBUG_VIS_MB_TYPE  = $00004000;
+  FF_DEBUG_BUFFERS      = $00008000;
 
   FF_DEBUG_VIS_MV_P_FOR  = $00000001; //visualize forward predicted MVs of P frames
   FF_DEBUG_VIS_MV_B_FOR  = $00000002; //visualize forward predicted MVs of B frames
@@ -1225,6 +1238,8 @@ type
 
     (**
      * qscale factor between IP and B-frames
+     * If > 0 then the last P-frame quantizer will be used (q= lastp_q*factor+offset).
+     * If < 0 then normal ratecontrol will be done (q= -normal_q*factor+offset).
      * - encoding: Set by user.
      * - decoding: unused
      *)
@@ -1336,14 +1351,19 @@ type
     (**
      * strictly follow the standard (MPEG4, ...).
      * - encoding: Set by user.
-     * - decoding: unused
+     * - decoding: Set by user.
+     * Setting this to STRICT or higher means the encoder and decoder will
+     * generally do stupid things. While setting it to inofficial or lower
+     * will mean the encoder might use things that are not supported by all
+     * spec compliant decoders. Decoders make no difference between normal,
+     * inofficial and experimental, that is they always try to decode things
+     * when they can unless they are explicitly asked to behave stupid
+     * (=strictly conform to the specs)
      *)
     strict_std_compliance: cint;
 
     (**
      * qscale offset between IP and B-frames
-     * If > 0 then the last P-frame quantizer will be used (q= lastp_q*factor+offset).
-     * If < 0 then normal ratecontrol will be done (q= -normal_q*factor+offset).
      * - encoding: Set by user.
      * - decoding: unused
      *)
@@ -2357,6 +2377,9 @@ type
     {$IF LIBAVCODEC_VERSION >= 51056000} // 51.56.0
     supported_samplerates: {const} PCint;       ///< array of supported audio samplerates, or NULL if unknown, array is terminated by 0
     {$IFEND}
+    {$IF LIBAVCODEC_VERSION >= 51062000} // 51.62.0
+    sample_fmts: {const} PSampleFormatArray;   ///< array of supported sample formats, or NULL if unknown, array is terminated by -1
+    {$IFEND}
   end;
 
 (**
@@ -2647,13 +2670,17 @@ function av_codec_next(c: PAVCodec): PAVCodec;
   cdecl; external av__codec;
 {$IFEND}
 
-(* returns LIBAVCODEC_VERSION_INT constant *)
-function avcodec_version (): cuint;
+(**
+ * Returns the LIBAVCODEC_VERSION_INT constant.
+ *)
+function avcodec_version(): cuint;
   cdecl; external av__codec;
 
+{$IF LIBAVCODEC_VERSION < 52008000} // 52.8.0
 (* returns LIBAVCODEC_BUILD constant *)
-function avcodec_build (): cuint;
-  cdecl; external av__codec;
+function avcodec_build(): cuint;
+  cdecl; external av__codec; deprecated;
+{$IFEND}
 
 (**
  * Initializes libavcodec.
@@ -2661,10 +2688,10 @@ function avcodec_build (): cuint;
  * @warning This function \e must be called before any other libavcodec
  * function.
  *)
-procedure avcodec_init ();
+procedure avcodec_init();
   cdecl; external av__codec;
 
-procedure register_avcodec (format: PAVCodec);
+procedure register_avcodec(format: PAVCodec);
   cdecl; external av__codec;
 
 (**
@@ -2673,7 +2700,7 @@ procedure register_avcodec (format: PAVCodec);
  * @param id CodecID of the requested encoder
  * @return An encoder if one was found, NULL otherwise.
  *)
-function avcodec_find_encoder (id: TCodecID): PAVCodec;
+function avcodec_find_encoder(id: TCodecID): PAVCodec;
   cdecl; external av__codec;
 
 (**
@@ -2682,7 +2709,7 @@ function avcodec_find_encoder (id: TCodecID): PAVCodec;
  * @param name name of the requested encoder
  * @return An encoder if one was found, NULL otherwise.
  *)
-function avcodec_find_encoder_by_name (name: pchar): PAVCodec;
+function avcodec_find_encoder_by_name(name: pchar): PAVCodec;
   cdecl; external av__codec;
 
 (**
@@ -2700,7 +2727,7 @@ function avcodec_find_decoder(id: TCodecID): PAVCodec;
  * @param name name of the requested decoder
  * @return A decoder if one was found, NULL otherwise.
  *)
-function avcodec_find_decoder_by_name (name: pchar): PAVCodec;
+function avcodec_find_decoder_by_name(name: pchar): PAVCodec;
   cdecl; external av__codec;
 procedure avcodec_string(buf: pchar; buf_size: cint; enc: PAVCodecContext; encode: cint);
   cdecl; external av__codec;
@@ -2710,7 +2737,7 @@ procedure avcodec_string(buf: pchar; buf_size: cint; enc: PAVCodecContext; encod
  *
  * @param s The AVCodecContext of which the fields should be set to default values.
  *)
-procedure avcodec_get_context_defaults (s: PAVCodecContext);
+procedure avcodec_get_context_defaults(s: PAVCodecContext);
   cdecl; external av__codec;
 
 {$IF LIBAVCODEC_VERSION >= 51039000} // 51.39.0
diff --git a/Game/Code/lib/ffmpeg/avformat.pas b/Game/Code/lib/ffmpeg/avformat.pas
index 1f132392..93ce60e5 100644
--- a/Game/Code/lib/ffmpeg/avformat.pas
+++ b/Game/Code/lib/ffmpeg/avformat.pas
@@ -1,8 +1,6 @@
 (*
  * copyright (c) 2001 Fabrice Bellard
  *
- * This file is part of FFmpeg.
- *
  * FFmpeg is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
  * License as published by the Free Software Foundation; either
@@ -20,14 +18,16 @@
 
 (*
  * 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 in the source codes.
+ * - 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 libavformat/avformat.h
  * 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
+ * Max. version: 52.20.0, revision 14667, Fri Aug 8 18:40:50 2008 UTC
  *)
 
 unit avformat;
@@ -59,7 +59,7 @@ uses
 const
   (* Max. supported version by this header *)
   LIBAVFORMAT_MAX_VERSION_MAJOR   = 52;
-  LIBAVFORMAT_MAX_VERSION_MINOR   = 16;
+  LIBAVFORMAT_MAX_VERSION_MINOR   = 20;
   LIBAVFORMAT_MAX_VERSION_RELEASE = 0;
   LIBAVFORMAT_MAX_VERSION = (LIBAVFORMAT_MAX_VERSION_MAJOR * VERSION_MAJOR) +
                             (LIBAVFORMAT_MAX_VERSION_MINOR * VERSION_MINOR) +
@@ -83,6 +83,15 @@ const
   {$MESSAGE Warn 'Linked version of libavformat may be unsupported!'}
 {$IFEND}
 
+{$IF LIBAVFORMAT_VERSION >= 52020000} // 52.20.0
+(**
+ * Returns the LIBAVFORMAT_VERSION_INT constant.
+ *)
+function avformat_version(): cuint;
+  cdecl; external av__format;
+{$IFEND}
+
+
 type
   PAVFile = Pointer;
 
@@ -294,13 +303,13 @@ type
     {$IFEND}
     standard: pchar; (* tv standard, NTSC, PAL, SECAM *)
     { Delphi does not support bit fields -> use bf_flags instead
-    int mpeg2ts_raw:1;  (* force raw MPEG2 transport stream output, if possible *)
-    int mpeg2ts_compute_pcr:1; (* compute exact PCR for each transport
+    unsigned int mpeg2ts_raw:1;  /**< force raw MPEG2 transport stream output, if possible */
+    unsigned int mpeg2ts_compute_pcr:1; /**< compute exact PCR for each transport
                                   stream packet (only meaningful if
-                                  mpeg2ts_raw is TRUE *)
-    int initial_pause:1;       (* do not begin to play the stream
-                                  immediately (RTSP only) *)
-    int prealloced_context:1;
+                                  mpeg2ts_raw is TRUE) */
+    unsigned int initial_pause:1;       /**< do not begin to play the stream
+                                        immediately (RTSP only) */
+    unsigned int prealloced_context:1;
     }
     bf_flags: byte; // 0:mpeg2ts_raw/1:mpeg2ts_compute_pcr/2:initial_pause/3:prealloced_context
     {$IF LIBAVFORMAT_VERSION_MAJOR < 53}
@@ -522,6 +531,10 @@ type
     {$IF LIBAVFORMAT_VERSION >= 52008000} // 52.8.0
     disposition: cint; (**< AV_DISPOSITION_* bitfield *)
     {$IFEND}
+
+    {$IF LIBAVFORMAT_VERSION >= 52019000} // 52.19.0
+    probe_data: TAVProbeData;
+    {$IFEND}
   end;
 
  (**
@@ -672,6 +685,19 @@ type
      *)
     debug: cint;
     {$IFEND}
+
+    {$IF LIBAVFORMAT_VERSION >= 52019000} // 52.19.0
+    (**
+     * raw packets from the demuxer, prior to parsing and decoding.
+     * This buffer is used for buffering packets until the codec can
+     * be identified, as parsing cannot be done without knowing the
+     * codec.
+     *)
+    raw_packet_buffer: PAVPacketList;
+    raw_packet_buffer_end: PAVPacketList;
+
+    packet_buffer_end: PAVPacketList;
+    {$IFEND}
   end;
 
   (**
diff --git a/Game/Code/lib/ffmpeg/avio.pas b/Game/Code/lib/ffmpeg/avio.pas
index 7df28122..70912e60 100644
--- a/Game/Code/lib/ffmpeg/avio.pas
+++ b/Game/Code/lib/ffmpeg/avio.pas
@@ -2,8 +2,6 @@
  * unbuffered io for ffmpeg system
  * copyright (c) 2001 Fabrice Bellard
  *
- * This file is part of FFmpeg.
- *
  * FFmpeg is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
  * License as published by the Free Software Foundation; either
@@ -19,9 +17,13 @@
  * 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 libavformat/avio.h
diff --git a/Game/Code/lib/ffmpeg/avutil.pas b/Game/Code/lib/ffmpeg/avutil.pas
index b7c8989c..17ae141a 100644
--- a/Game/Code/lib/ffmpeg/avutil.pas
+++ b/Game/Code/lib/ffmpeg/avutil.pas
@@ -16,17 +16,20 @@
  * 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
+ *)
 
 (*
  * Conversions of
  *
  * libavutil/avutil.h:
  *  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
+ *  Max. version: 49.8.0, revision 14665, Fri Aug 8 18:32:20 2008 UTC
  *
  * libavutil/mem.h:
  *  revision 13665, Thu Jun 5 19:49:47 2008 UTC
@@ -60,7 +63,7 @@ uses
 const
   (* Max. supported version by this header *)
   LIBAVUTIL_MAX_VERSION_MAJOR   = 49;
-  LIBAVUTIL_MAX_VERSION_MINOR   = 7;
+  LIBAVUTIL_MAX_VERSION_MINOR   = 8;
   LIBAVUTIL_MAX_VERSION_RELEASE = 0;
   LIBAVUTIL_MAX_VERSION = (LIBAVUTIL_MAX_VERSION_MAJOR * VERSION_MAJOR) +
                           (LIBAVUTIL_MAX_VERSION_MINOR * VERSION_MINOR) +
@@ -83,6 +86,14 @@ const
   {$MESSAGE Warn 'Linked version of libavutil may be unsupported!'}
 {$IFEND}
 
+{$IF LIBAVUTIL_VERSION >= 49008000} // 49.8.0
+(**
+ * Returns the LIBAVUTIL_VERSION_INT constant.
+ *)
+function avutil_version(): cuint;
+  cdecl; external av__format;
+{$IFEND}
+
 type
 (**
  * Pixel format. Notes:
diff --git a/Game/Code/lib/ffmpeg/mathematics.pas b/Game/Code/lib/ffmpeg/mathematics.pas
index 331178e1..2d352df0 100644
--- a/Game/Code/lib/ffmpeg/mathematics.pas
+++ b/Game/Code/lib/ffmpeg/mathematics.pas
@@ -16,9 +16,13 @@
  * 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 libavutil/mathematics.h
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}
 
diff --git a/Game/Code/lib/ffmpeg/rational.pas b/Game/Code/lib/ffmpeg/rational.pas
index ed571f41..5a2629a9 100644
--- a/Game/Code/lib/ffmpeg/rational.pas
+++ b/Game/Code/lib/ffmpeg/rational.pas
@@ -17,10 +17,13 @@
  * 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 libavutil/rational.h
diff --git a/Game/Code/lib/ffmpeg/swscale.pas b/Game/Code/lib/ffmpeg/swscale.pas
index 4dcd62be..cac14d57 100644
--- a/Game/Code/lib/ffmpeg/swscale.pas
+++ b/Game/Code/lib/ffmpeg/swscale.pas
@@ -1,8 +1,6 @@
 (*
  * Copyright (C) 2001-2003 Michael Niedermayer <michaelni@gmx.at>
  *
- * This file is part of FFmpeg.
- *
  * FFmpeg is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
  * License as published by the Free Software Foundation; either
@@ -17,10 +15,10 @@
  * License along with FFmpeg; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  *)
+
 (*
- * @file swscale.h
- * @brief
- *     external api for the swscale stuff
+ * FFmpeg Pascal port
+ * - Ported by the UltraStar Deluxe Team
  *)
 
 (*