fixed revision numbers, macros, ...

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

19 files changed, 201 insertions, 154 deletions

diff --git a/src/lib/ffmpeg-0.7/avcodec.pas b/src/lib/ffmpeg-0.7/avcodec.pas
index 307c3ae2..159c9b58 100644
--- a/src/lib/ffmpeg-0.7/avcodec.pas
+++ b/src/lib/ffmpeg-0.7/avcodec.pas
@@ -80,7 +80,7 @@ const
    *)
   (* Supported version by this header *)
   LIBAVCODEC_MAX_VERSION_MAJOR   = 52;
-  LIBAVCODEC_MAX_VERSION_MINOR   = 122;
+  LIBAVCODEC_MAX_VERSION_MINOR   = 123;
   LIBAVCODEC_MAX_VERSION_RELEASE = 0;
   LIBAVCODEC_MAX_VERSION = (LIBAVCODEC_MAX_VERSION_MAJOR * VERSION_MAJOR) +
                            (LIBAVCODEC_MAX_VERSION_MINOR * VERSION_MINOR) +
@@ -96,12 +96,12 @@ const
 
 (* Check if linked versions are supported *)
 {$IF (LIBAVCODEC_VERSION < LIBAVCODEC_MIN_VERSION)}
-//  {$MESSAGE Error 'Linked version of libavcodec is too old!'}
+  {$MESSAGE Error 'Linked version of libavcodec is too old!'}
 {$IFEND}
 
 (* Check if linked version is supported *)
 {$IF (LIBAVCODEC_VERSION > LIBAVCODEC_MAX_VERSION)}
-//  {$MESSAGE Error 'Linked version of libavcodec is not yet supported!'}
+  {$MESSAGE Error 'Linked version of libavcodec is not yet supported!'}
 {$IFEND}
 
 (**
@@ -175,7 +175,7 @@ const
 
 {$IF FF_API_OLD_AUDIOCONVERT}
   {$I libavcodec/audioconvert.pas}
-{$ENDIF}
+{$IFEND}
 
 type
   FF_INTERNALC_MEM_TYPE = cuint;
diff --git a/src/lib/ffmpeg-0.7/avformat.pas b/src/lib/ffmpeg-0.7/avformat.pas
index 99af7410..848f1672 100644
--- a/src/lib/ffmpeg-0.7/avformat.pas
+++ b/src/lib/ffmpeg-0.7/avformat.pas
@@ -83,7 +83,7 @@ const
 
 (* Check if linked versions are supported *)
 {$IF (LIBAVFORMAT_VERSION > LIBAVFORMAT_MAX_VERSION)}
-//  {$MESSAGE Error 'Linked version of libavformat is not yet supported!'}
+  {$MESSAGE Error 'Linked version of libavformat is not yet supported!'}
 {$IFEND}
 
 {
@@ -223,7 +223,7 @@ function av_metadata_get(m: PAVDictionary; key: {const} PAnsiChar;
  *)
 function av_metadata_set(var pm: PAVMetadata; key: {const} PAnsiChar; value: {const} PAnsiChar): cint;
   cdecl; external av__format; deprecated;
-{$ENDIF}
+{$IFEND}
 
 (**
  * Set the given tag in *pm, overwriting an existing tag.
@@ -255,7 +255,7 @@ procedure av_metadata_copy(var dst: PAVDictionary; src: PAVDictionary; flags: ci
 procedure av_metadata_free(var m: PAVDictionary);
   cdecl; external av__format; deprecated;
 
-{$ENDIF}
+{$IFEND}
 
 (* packet functions *)
 
@@ -434,7 +434,7 @@ type
     start, end_: cint64;      ///< chapter start/end time in time_base units
 {$IF FF_API_OLD_METADATA}
     title: PAnsiChar;         ///< chapter title
-{$ENDIF}
+{$IFEND}
     metadata: PAVDictionary;
   end;
 
@@ -711,7 +711,7 @@ type
 
 {$IF FF_API_OLD_METADATA}
     language: array [0..3] of PAnsiChar; (**< ISO 639-2/B 3-letter language code (empty string if undefined) *)
-{$ENDIF}
+{$IFEND}
 
     (* av_read_frame() support *)
     need_parsing: TAVStreamParseType;
@@ -731,7 +731,7 @@ type
     unused: array [0..4] of cint64;
 {$IF FF_API_OLD_METADATA}
     filename: PAnsiChar; (**< source filename of the stream *)
-{$ENDIF}    
+{$IFEND}    
 
     disposition: cint; (**< AV_DISPOSITION_* bitfield *)
     probe_data: TAVProbeData;
@@ -833,7 +833,7 @@ type
     streams: array [0..MAX_STREAMS - 1] of PAVStream;
 {$ELSE}
     streams: PPAVStream;
-{$ENDIF}
+{$IFEND}
     filename: array [0..1023] of AnsiChar; (* input or output filename *)
     (* stream info *)
     timestamp: cint64;
@@ -846,7 +846,7 @@ type
     year: cint;  (**< ID3 year, 0 if none *)
     track: cint; (**< track number, 0 if none *)
     genre: array [0..31] of AnsiChar; (**< ID3 genre *)
-{$ENDIF}
+{$IFEND}
 
     ctx_flags: cint; (**< Format-specific flags, see AVFMTCTX_xx *)
     (* private data for pts handling (do not modify directly). *)
@@ -1005,7 +1005,7 @@ type
 {$IF FF_API_OLD_METADATA}
       provider_name     : PAnsiChar;  ///< network name for DVB streams
       name              : PAnsiChar;  ///< service name for DVB streams
-{$ENDIF}
+{$IFEND}
       flags             : cint;
       discard           : TAVDiscard; ///< selects which program to discard and which to feed to the caller
       stream_index      : PCardinal;
diff --git a/src/lib/ffmpeg-0.7/avio.pas b/src/lib/ffmpeg-0.7/avio.pas
index ad3c8c80..7cd31a3d 100644
--- a/src/lib/ffmpeg-0.7/avio.pas
+++ b/src/lib/ffmpeg-0.7/avio.pas
@@ -130,7 +130,7 @@ type
     write_flag: cint;    (**< true if open for writing *)
 {$IF FF_API_OLD_AVIO}
     is_streamed: cint; { deprecated }
-{$ENDIF}
+{$IFEND}
     max_packet_size: cint;
     checksum: culong;
     checksum_ptr: PByteArray;
@@ -171,7 +171,7 @@ type
   TURLContext = record
 {$IF FF_API_URL_CLASS}
     av_class: {const} PAVClass; ///< information for av_log(). Set by url_open().
-{$ENDIF}
+{$IFEND}
     prot: PURLProtocol;
     flags: cint;
     is_streamed: cint;  (**< true if streamed (no seek possible), default = false *)
@@ -488,7 +488,7 @@ function url_close_buf(s: PAVIOContext): cint;
  *)
 function url_exist(url: {const} PAnsiChar): cint;
   cdecl; external av__format; deprecated;
-{$ENDIF} // FF_API_OLD_AVIO
+{$IFEND} // FF_API_OLD_AVIO
 
 (**
  * Return AVIO_* access flags corresponding to the access permissions
@@ -536,7 +536,7 @@ function register_protocol(protocol: PURLProtocol): cint;
  *)
 function av_register_protocol(protocol: PURLProtocol): cint;
   cdecl; external av__format; deprecated;
-{$ENDIF}
+{$IFEND}
 
 (**
  * Allocate and initialize an AVIOContext for buffered I/O. It must be later
@@ -738,7 +738,7 @@ function avio_get_str16be(pb: PAVIOContext; maxlen: cint; buf: PAnsiChar; buflen
  *        to set up the buffer for writing. *)
 function url_resetbuf(s: PAVIOContext; flags: cint): cint;
   cdecl; external av__format;
-{$ENDIF}
+{$IFEND}
 
 (**
  * @defgroup open_modes URL open modes
@@ -756,7 +756,7 @@ const
   AVIO_RDONLY = 1;    (**< read-only *)
   AVIO_WRONLY = 2;    (**< write-only *)
   AVIO_RDWR   = 4;    (**< read-write *)
-{$ENDIF}
+{$IFEND}
 (**
  * @
  *)
@@ -778,7 +778,7 @@ const
   AVIO_FLAG_NONBLOCK = 4;    
 {$ELSE}
   AVIO_FLAG_NONBLOCK = 8;    
-{$ENDIF}
+{$IFEND}
 
 (**
  * Create and initialize a AVIOContext for accessing the
@@ -829,7 +829,7 @@ function avio_close_dyn_buf(s: PAVIOContext; var pbuffer: Pcuint8): cint;
 {$IF FF_API_UDP_GET_FILE}
 function udp_get_file_handle(h: PURLContext): cint;
   cdecl; external av__format;
-{$ENDIF}
+{$IFEND}
 
 (**
  * Iterate through names of available protocols.
@@ -882,14 +882,30 @@ function url_is_streamed(s: PAVIOContext): cint;
 begin
   Result := s^.is_streamed;
 end;
+{$IFEND}
+
+(**
+ * For SEEK_CUR on Windows
+ * values taken from stdio.h of C
+ *)
+{$IFNDEF SEEK_SET}
+const
+  SEEK_SET = 0;
+{$ENDIF}
+
+{$IFNDEF SEEK_CUR}
+const
+  SEEK_CUR = 1;
+{$ENDIF}
+
+{$IFNDEF SEEK_END}
+const
+  SEEK_END = 2;
 {$ENDIF}
 
-{$IFDEF UNIX}
 function avio_tell(s: PAVIOContext): cint64; {$IFDEF HasInline}inline;{$ENDIF}
 begin
   Result := avio_seek(s, 0, SEEK_CUR);
 end;
-{$ELSE}
-{$ENDIF}
 
 end.
diff --git a/src/lib/ffmpeg-0.7/avutil.pas b/src/lib/ffmpeg-0.7/avutil.pas
index 3e6f5bcc..7d8ce826 100644
--- a/src/lib/ffmpeg-0.7/avutil.pas
+++ b/src/lib/ffmpeg-0.7/avutil.pas
@@ -98,8 +98,13 @@ const
 
 (* libavutil/common.h *) // until now MKTAG and MKBETAG is all from common.h KMS 19/5/2010
 
-function MKTAG  (a, b, c, d: AnsiChar): integer;
-function MKBETAG(a, b, c, d: AnsiChar): integer;
+(**
+ * MKTAG and MKBETAG are usually used to convert a magic string to an enumeration index.
+ * In Pascal this can probably not be used and the functions could be removed.
+ * KMS 8/6/2012
+ *)
+function MKTAG  (a, b, c, d: AnsiChar): integer; {$IFDEF HasInline}inline;{$ENDIF}
+function MKBETAG(a, b, c, d: AnsiChar): integer; {$IFDEF HasInline}inline;{$ENDIF}
 
 (**
  * Return the LIBAVUTIL_VERSION_INT constant.
@@ -147,7 +152,7 @@ const
  * They may change, break or disappear at any time.
  *)
 {$IFNDEF FF_API_OLD_IMAGE_NAMES}
-  {$DEFINE FF_API_OLD_IMAGE_NAMES = (LIBAVUTIL_VERSION_MAJOR < 51)}
+  FF_API_OLD_IMAGE_NAMES = (LIBAVUTIL_VERSION_MAJOR < 51);
 {$ENDIF}
 type
   TAVPictureType = (
@@ -174,12 +179,12 @@ implementation
 
 (* libavutil/common.h *)
 
-function MKTAG(a, b, c, d: AnsiChar): integer;
+function MKTAG(a, b, c, d: AnsiChar): integer; {$IFDEF HasInline}inline;{$ENDIF}
 begin
   Result := (ord(a) or (ord(b) shl 8) or (ord(c) shl 16) or (ord(d) shl 24));
 end;
 
-function MKBETAG(a, b, c, d: AnsiChar): integer;
+function MKBETAG(a, b, c, d: AnsiChar): integer; {$IFDEF HasInline}inline;{$ENDIF}
 begin
   Result := (ord(d) or (ord(c) shl 8) or (ord(b) shl 16) or (ord(a) shl 24));
 end;
diff --git a/src/lib/ffmpeg-0.7/swscale.pas b/src/lib/ffmpeg-0.7/swscale.pas
index 9806fc85..688be6dd 100644
--- a/src/lib/ffmpeg-0.7/swscale.pas
+++ b/src/lib/ffmpeg-0.7/swscale.pas
@@ -98,7 +98,7 @@ const
 {$ifndef FF_API_SWS_CPU_CAPS}
   FF_API_SWS_CPU_CAPS = LIBSWSCALE_VERSION_MAJOR < 3;    
 {$endif}
-{$ifndef FF_API_SWS_GETCONTEXT}
+{$ifndef FF_API_SWS_FORMAT_NAME}
   FF_API_SWS_FORMAT_NAME = LIBSWSCALE_VERSION_MAJOR < 3;    
 {$endif}
 
@@ -160,7 +160,7 @@ const
   SWS_CPU_CAPS_3DNOW    = $40000000;
   SWS_CPU_CAPS_ALTIVEC  = $10000000;
   SWS_CPU_CAPS_BFIN     = $01000000;
-{$endif}
+{$ifend}
 
   SWS_MAX_REDUCE_CUTOFF = 0.002;
 
@@ -260,10 +260,10 @@ procedure sws_freeContext(swsContext: PSwsContext);
  *)
 function sws_getContext(srcW: cint; srcH: cint; srcFormat: TAVPixelFormat;
                         dstW: cint; dstH: cint; dstFormat: TAVPixelFormat;
-	                flags: cint; srcFilter: PSwsFilter;
-	                dstFilter: PSwsFilter; param: PCdouble): PSwsContext;
+                        flags: cint; srcFilter: PSwsFilter;
+                        dstFilter: PSwsFilter; param: PCdouble): PSwsContext;
   cdecl; external sw__scale;
-{$endif}
+{$ifend}
 
 (**
  * Scales the image slice in srcSlice and puts the resulting scaled
@@ -299,7 +299,7 @@ function sws_scale(context: PSwsContext; {const} srcSlice: PPCuint8Array; {const
 // deprecated. Use sws_scale() instead.
 function sws_scale_ordered(context: PSwsContext; {const} src: PPCuint8Array;
                            srcStride: PCintArray; srcSliceY: cint; srcSliceH: cint;
-	                   dst: PPCuint8Array; dstStride: PCintArray): cint;
+                           dst: PPCuint8Array; dstStride: PCintArray): cint;
   cdecl; external sw__scale; deprecated;
 {$ifend}
 
@@ -393,7 +393,7 @@ procedure sws_printVec(a: PSwsVector);
  *)
 procedure sws_printVec2(a:         PSwsVector;
                         log_ctx:   PAVClass; // PAVClass is declared in avcodec.pas
-			log_level: cint);
+                        log_level: cint);
   cdecl; external sw__scale;
 
 procedure sws_freeVec(a: PSwsVector);
@@ -401,8 +401,8 @@ procedure sws_freeVec(a: PSwsVector);
 
 function sws_getDefaultFilter(lumaGBlur: cfloat; chromaGBlur: cfloat; 
                               lumaSharpen: cfloat; chromaSharpen: cfloat;
-			      chromaHShift: cfloat; chromaVShift: cfloat;
-			      verbose: cint): PSwsFilter;
+                              chromaHShift: cfloat; chromaVShift: cfloat;
+                              verbose: cint): PSwsFilter;
   cdecl; external sw__scale;
 
 procedure sws_freeFilter(filter: PSwsFilter);
@@ -424,8 +424,8 @@ procedure sws_freeFilter(filter: PSwsFilter);
 function sws_getCachedContext(context: PSwsContext;
               srcW: cint; srcH: cint; srcFormat: TAVPixelFormat;
               dstW: cint; dstH: cint; dstFormat: TAVPixelFormat;
-	      flags: cint; srcFilter: PSwsFilter; 
-	      dstFilter: PSwsFilter; param: PCdouble): PSwsContext;
+              flags: cint; srcFilter: PSwsFilter; 
+              dstFilter: PSwsFilter; param: PCdouble): PSwsContext;
   cdecl; external sw__scale;
 
 (**
@@ -438,10 +438,10 @@ function sws_getCachedContext(context: PSwsContext;
  * @param num_pixels number of pixels to convert
  * @param palette    array with [256] entries, which must match color arrangement (RGB or BGR) of src
  *)
-procedure sws_convertPalette8ToPacked32({const} src:      PPCuint8Array;
-                                         dst:             PPCuint8Array;
-					 num_pixels:      clong;
-					 {const} palette: PPCuint8Array);
+procedure sws_convertPalette8ToPacked32({const} src:     PPCuint8Array;
+                                        dst:             PPCuint8Array;
+                                        num_pixels:      clong;
+                                        {const} palette: PPCuint8Array);
   cdecl; external sw__scale;
 
 (**
@@ -454,10 +454,10 @@ procedure sws_convertPalette8ToPacked32({const} src:      PPCuint8Array;
  * @param num_pixels number of pixels to convert
  * @param palette    array with [256] entries, which must match color arrangement (RGB or BGR) of src
  *)
-procedure sws_convertPalette8ToPacked24({const} src:      PPCuint8Array;
-                                         dst:             PPCuint8Array;
-					 num_pixels:      clong;
-					 {const} palette: PPCuint8Array);
+procedure sws_convertPalette8ToPacked24({const} src:     PPCuint8Array;
+                                        dst:             PPCuint8Array;
+                                        num_pixels:      clong;
+                                        {const} palette: PPCuint8Array);
   cdecl; external sw__scale;
 
 implementation
diff --git a/src/lib/ffmpeg-0.8/avcodec.pas b/src/lib/ffmpeg-0.8/avcodec.pas
index 56c6afb8..6a3d568f 100644
--- a/src/lib/ffmpeg-0.8/avcodec.pas
+++ b/src/lib/ffmpeg-0.8/avcodec.pas
@@ -22,7 +22,7 @@
  * - Changes and updates by the UltraStar Deluxe Team
  *
  * Conversion of libavcodec/avcodec.h
- * version: 52.122.0
+ * version: 53.7.0 - 53.8.0
  *
  *)
 
@@ -79,16 +79,16 @@ const
    * fix. 
    *)
   (* Supported version by this header *)
-  LIBAVCODEC_MAX_VERSION_MAJOR   = 52;
-  LIBAVCODEC_MAX_VERSION_MINOR   = 122;
+  LIBAVCODEC_MAX_VERSION_MAJOR   = 53;
+  LIBAVCODEC_MAX_VERSION_MINOR   = 8;
   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);
 
   (* Min. supported version by this header *)
-  LIBAVCODEC_MIN_VERSION_MAJOR   = 52;
-  LIBAVCODEC_MIN_VERSION_MINOR   = 122;
+  LIBAVCODEC_MIN_VERSION_MAJOR   = 53;
+  LIBAVCODEC_MIN_VERSION_MINOR   = 7;
   LIBAVCODEC_MIN_VERSION_RELEASE = 0;
   LIBAVCODEC_MIN_VERSION = (LIBAVCODEC_MIN_VERSION_MAJOR * VERSION_MAJOR) +
                             (LIBAVCODEC_MIN_VERSION_MINOR * VERSION_MINOR) +
@@ -96,12 +96,12 @@ const
 
 (* Check if linked versions are supported *)
 {$IF (LIBAVCODEC_VERSION < LIBAVCODEC_MIN_VERSION)}
-//  {$MESSAGE Error 'Linked version of libavcodec is too old!'}
+  {$MESSAGE Error 'Linked version of libavcodec is too old!'}
 {$IFEND}
 
 (* Check if linked version is supported *)
 {$IF (LIBAVCODEC_VERSION > LIBAVCODEC_MAX_VERSION)}
-//  {$MESSAGE Error 'Linked version of libavcodec is not yet supported!'}
+  {$MESSAGE Error 'Linked version of libavcodec is not yet supported!'}
 {$IFEND}
 
 (**
@@ -175,7 +175,7 @@ const
 
 {$IF FF_API_OLD_AUDIOCONVERT}
   {$I libavcodec/audioconvert.pas}
-{$ENDIF}
+{$IFEND}
 
 const
   AV_NOPTS_VALUE: cint64  = $8000000000000000;
diff --git a/src/lib/ffmpeg-0.8/avformat.pas b/src/lib/ffmpeg-0.8/avformat.pas
index f119c784..bc87e551 100644
--- a/src/lib/ffmpeg-0.8/avformat.pas
+++ b/src/lib/ffmpeg-0.8/avformat.pas
@@ -21,9 +21,9 @@
  *   in the source codes.
  * - Changes and updates by the UltraStar Deluxe Team
  *
- * Conversion of version 0.7 libavformat/avformat.h
- * Min. version: 52.110.0
- * Max. version: 52.111.0
+ * Conversion of version 0.8 libavformat/avformat.h
+ * Min. version: 53.4.0
+ * Max. version: 53.5.0
  *)
 
 unit avformat;
@@ -61,16 +61,16 @@ const
    * by removing all unneeded conditionals.
    *)
   (* Max. supported version by this header *)
-  LIBAVFORMAT_MAX_VERSION_MAJOR   = 52;
-  LIBAVFORMAT_MAX_VERSION_MINOR   = 111;
+  LIBAVFORMAT_MAX_VERSION_MAJOR   = 53;
+  LIBAVFORMAT_MAX_VERSION_MINOR   = 5;
   LIBAVFORMAT_MAX_VERSION_RELEASE = 0;
   LIBAVFORMAT_MAX_VERSION = (LIBAVFORMAT_MAX_VERSION_MAJOR * VERSION_MAJOR) +
                             (LIBAVFORMAT_MAX_VERSION_MINOR * VERSION_MINOR) +
                             (LIBAVFORMAT_MAX_VERSION_RELEASE * VERSION_RELEASE);
 
   (* Min. supported version by this header *)
-  LIBAVFORMAT_MIN_VERSION_MAJOR   = 52;
-  LIBAVFORMAT_MIN_VERSION_MINOR   = 110;
+  LIBAVFORMAT_MIN_VERSION_MAJOR   = 53;
+  LIBAVFORMAT_MIN_VERSION_MINOR   = 4;
   LIBAVFORMAT_MIN_VERSION_RELEASE = 0;
   LIBAVFORMAT_MIN_VERSION = (LIBAVFORMAT_MIN_VERSION_MAJOR * VERSION_MAJOR) +
                             (LIBAVFORMAT_MIN_VERSION_MINOR * VERSION_MINOR) +
@@ -83,7 +83,7 @@ const
 
 (* Check if linked versions are supported *)
 {$IF (LIBAVFORMAT_VERSION > LIBAVFORMAT_MAX_VERSION)}
-//  {$MESSAGE Error 'Linked version of libavformat is not yet supported!'}
+  {$MESSAGE Error 'Linked version of libavformat is not yet supported!'}
 {$IFEND}
 
 {
@@ -240,7 +240,7 @@ procedure av_metadata_copy(var dst: PAVDictionary; src: PAVDictionary; flags: ci
 procedure av_metadata_free(var m: PAVDictionary);
   cdecl; external av__format; deprecated;
 
-{$ENDIF}
+{$IFEND}
 
 (* packet functions *)
 
diff --git a/src/lib/ffmpeg-0.8/avio.pas b/src/lib/ffmpeg-0.8/avio.pas
index 99725ec3..a31d17e6 100644
--- a/src/lib/ffmpeg-0.8/avio.pas
+++ b/src/lib/ffmpeg-0.8/avio.pas
@@ -130,7 +130,7 @@ type
     write_flag: cint;    (**< true if open for writing *)
 {$IF FF_API_OLD_AVIO}
     is_streamed: cint; { deprecated }
-{$ENDIF}
+{$IFEND}
     max_packet_size: cint;
     checksum: culong;
     checksum_ptr: PByteArray;
@@ -486,7 +486,7 @@ function url_close_buf(s: PAVIOContext): cint;
  *)
 function url_exist(url: {const} PAnsiChar): cint;
   cdecl; external av__format; deprecated;
-{$ENDIF} // FF_API_OLD_AVIO
+{$IFEND} // FF_API_OLD_AVIO
 
 (**
  * Return AVIO_FLAG_* access flags corresponding to the access permissions
@@ -833,14 +833,30 @@ function url_is_streamed(s: PAVIOContext): cint;
 begin
   Result := s^.is_streamed;
 end;
+{$IFEND}
+
+(**
+ * For SEEK_CUR on Windows
+ * values taken from stdio.h of C
+ *)
+{$IFNDEF SEEK_SET}
+const
+  SEEK_SET = 0;
+{$ENDIF}
+
+{$IFNDEF SEEK_CUR}
+const
+  SEEK_CUR = 1;
+{$ENDIF}
+
+{$IFNDEF SEEK_END}
+const
+  SEEK_END = 2;
 {$ENDIF}
 
-{$IFDEF UNIX}
 function avio_tell(s: PAVIOContext): cint64; {$IFDEF HasInline}inline;{$ENDIF}
 begin
   Result := avio_seek(s, 0, SEEK_CUR);
 end;
-{$ELSE}
-{$ENDIF}
 
 end.
diff --git a/src/lib/ffmpeg-0.8/avutil.pas b/src/lib/ffmpeg-0.8/avutil.pas
index 541aaa61..aca94cc0 100644
--- a/src/lib/ffmpeg-0.8/avutil.pas
+++ b/src/lib/ffmpeg-0.8/avutil.pas
@@ -98,8 +98,13 @@ const
 
 (* libavutil/common.h *) // until now MKTAG and MKBETAG is all from common.h KMS 19/5/2010
 
-function MKTAG  (a, b, c, d: AnsiChar): integer;
-function MKBETAG(a, b, c, d: AnsiChar): integer;
+(**
+ * MKTAG and MKBETAG are usually used to convert a magic string to an enumeration index.
+ * In Pascal this can probably not be used and the functions could be removed.
+ * KMS 8/6/2012
+ *)
+function MKTAG  (a, b, c, d: AnsiChar): integer; {$IFDEF HasInline}inline;{$ENDIF}
+function MKBETAG(a, b, c, d: AnsiChar): integer; {$IFDEF HasInline}inline;{$ENDIF}
 
 (**
  * Return the LIBAVUTIL_VERSION_INT constant.
@@ -167,12 +172,12 @@ implementation
 
 (* libavutil/common.h *)
 
-function MKTAG(a, b, c, d: AnsiChar): integer;
+function MKTAG(a, b, c, d: AnsiChar): integer; {$IFDEF HasInline}inline;{$ENDIF}
 begin
   Result := (ord(a) or (ord(b) shl 8) or (ord(c) shl 16) or (ord(d) shl 24));
 end;
 
-function MKBETAG(a, b, c, d: AnsiChar): integer;
+function MKBETAG(a, b, c, d: AnsiChar): integer; {$IFDEF HasInline}inline;{$ENDIF}
 begin
   Result := (ord(d) or (ord(c) shl 8) or (ord(b) shl 16) or (ord(a) shl 24));
 end;
diff --git a/src/lib/ffmpeg-0.8/libavutil/mem.pas b/src/lib/ffmpeg-0.8/libavutil/mem.pas
index c438bbfc..73bbf976 100644
--- a/src/lib/ffmpeg-0.8/libavutil/mem.pas
+++ b/src/lib/ffmpeg-0.8/libavutil/mem.pas
@@ -19,7 +19,7 @@
  * - Changes and updates by the UltraStar Deluxe Team
  *
  * Conversion of libavutil/mem.h
- * avutil version 50.43.0
+ * avutil version 51.9.1
  *
  *)
 
diff --git a/src/lib/ffmpeg-0.8/libavutil/samplefmt.pas b/src/lib/ffmpeg-0.8/libavutil/samplefmt.pas
index 3335fa2d..c37a3740 100644
--- a/src/lib/ffmpeg-0.8/libavutil/samplefmt.pas
+++ b/src/lib/ffmpeg-0.8/libavutil/samplefmt.pas
@@ -19,7 +19,7 @@
  * This is a part of the Pascal port of ffmpeg.
  *
  * Conversion of libavutil/samplefmt.h
- * avutil version 50.43.0
+ * avutil version 51.9.1
  *
  *)
 
diff --git a/src/lib/ffmpeg-0.8/swscale.pas b/src/lib/ffmpeg-0.8/swscale.pas
index f9f53d8c..b32cdeda 100644
--- a/src/lib/ffmpeg-0.8/swscale.pas
+++ b/src/lib/ffmpeg-0.8/swscale.pas
@@ -80,7 +80,7 @@ const
 
 (* Check if linked versions are supported *)
 {$IF (LIBSWSCALE_VERSION > LIBSWSCALE_MAX_VERSION)}
-//  {$MESSAGE Error 'Linked version of libswscale is not yet supported!'}
+  {$MESSAGE Error 'Linked version of libswscale is not yet supported!'}
 {$IFEND}
 
 type
@@ -98,7 +98,7 @@ const
 {$ifndef FF_API_SWS_CPU_CAPS}
   FF_API_SWS_CPU_CAPS = LIBSWSCALE_VERSION_MAJOR < 3;    
 {$endif}
-{$ifndef FF_API_SWS_GETCONTEXT}
+{$ifndef FF_API_SWS_FORMAT_NAME}
   FF_API_SWS_FORMAT_NAME = LIBSWSCALE_VERSION_MAJOR < 3;    
 {$endif}
 
@@ -150,7 +150,7 @@ const
   SWS_ACCURATE_RND      = $40000;
   SWS_BITEXACT          = $80000;
 
-{$if FF_API_SWS_CPU_CAPS}
+{$IF FF_API_SWS_CPU_CAPS}
 (**
  * CPU caps are autodetected now, those flags
  * are only provided for API compatibility.
@@ -160,7 +160,7 @@ const
   SWS_CPU_CAPS_3DNOW    = $40000000;
   SWS_CPU_CAPS_ALTIVEC  = $10000000;
   SWS_CPU_CAPS_BFIN     = $01000000;
-{$endif}
+{$IFEND}
 
   SWS_MAX_REDUCE_CUTOFF = 0.002;
 
@@ -244,7 +244,7 @@ function sws_init_context(sws_context: PSwsContext; srcFilter: PSwsFilter; dstFi
 procedure sws_freeContext(swsContext: PSwsContext);
   cdecl; external sw__scale;
 
-{$if FF_API_SWS_GETCONTEXT}
+{$IF FF_API_SWS_GETCONTEXT}
 (**
  * Allocates and returns a SwsContext. You need it to perform
  * scaling/conversion operations using sws_scale().
@@ -260,10 +260,10 @@ procedure sws_freeContext(swsContext: PSwsContext);
  *)
 function sws_getContext(srcW: cint; srcH: cint; srcFormat: TAVPixelFormat;
                         dstW: cint; dstH: cint; dstFormat: TAVPixelFormat;
-	                flags: cint; srcFilter: PSwsFilter;
-	                dstFilter: PSwsFilter; param: PCdouble): PSwsContext;
+                        flags: cint; srcFilter: PSwsFilter;
+                        dstFilter: PSwsFilter; param: PCdouble): PSwsContext;
   cdecl; external sw__scale;
-{$endif}
+{$IFEND}
 
 (**
  * Scales the image slice in srcSlice and puts the resulting scaled
@@ -301,7 +301,7 @@ function sws_scale(context: PSwsContext; {const} srcSlice: PPCuint8Array; {const
  *)
 function sws_scale_ordered(context: PSwsContext; {const} src: PPCuint8Array;
                            srcStride: PCintArray; srcSliceY: cint; srcSliceH: cint;
-	                   dst: PPCuint8Array; dstStride: PCintArray): cint;
+                           dst: PPCuint8Array; dstStride: PCintArray): cint;
   cdecl; external sw__scale; deprecated;
 {$ifend}
 
@@ -395,7 +395,7 @@ procedure sws_printVec(a: PSwsVector);
  *)
 procedure sws_printVec2(a:         PSwsVector;
                         log_ctx:   PAVClass; // PAVClass is declared in avcodec.pas
-			log_level: cint);
+                        log_level: cint);
   cdecl; external sw__scale;
 
 procedure sws_freeVec(a: PSwsVector);
@@ -403,8 +403,8 @@ procedure sws_freeVec(a: PSwsVector);
 
 function sws_getDefaultFilter(lumaGBlur: cfloat; chromaGBlur: cfloat; 
                               lumaSharpen: cfloat; chromaSharpen: cfloat;
-			      chromaHShift: cfloat; chromaVShift: cfloat;
-			      verbose: cint): PSwsFilter;
+                              chromaHShift: cfloat; chromaVShift: cfloat;
+                              verbose: cint): PSwsFilter;
   cdecl; external sw__scale;
 
 procedure sws_freeFilter(filter: PSwsFilter);
@@ -426,8 +426,8 @@ procedure sws_freeFilter(filter: PSwsFilter);
 function sws_getCachedContext(context: PSwsContext;
               srcW: cint; srcH: cint; srcFormat: TAVPixelFormat;
               dstW: cint; dstH: cint; dstFormat: TAVPixelFormat;
-	      flags: cint; srcFilter: PSwsFilter; 
-	      dstFilter: PSwsFilter; param: PCdouble): PSwsContext;
+              flags: cint; srcFilter: PSwsFilter; 
+              dstFilter: PSwsFilter; param: PCdouble): PSwsContext;
   cdecl; external sw__scale;
 
 (**
@@ -440,10 +440,10 @@ function sws_getCachedContext(context: PSwsContext;
  * @param num_pixels number of pixels to convert
  * @param palette    array with [256] entries, which must match color arrangement (RGB or BGR) of src
  *)
-procedure sws_convertPalette8ToPacked32({const} src:      PPCuint8Array;
-                                         dst:             PPCuint8Array;
-					 num_pixels:      cint;
-					 {const} palette: PPCuint8Array);
+procedure sws_convertPalette8ToPacked32({const} src:     PPCuint8Array;
+                                        dst:             PPCuint8Array;
+                                        num_pixels:      cint;
+                                        {const} palette: PPCuint8Array);
   cdecl; external sw__scale;
 
 (**
@@ -456,10 +456,10 @@ procedure sws_convertPalette8ToPacked32({const} src:      PPCuint8Array;
  * @param num_pixels number of pixels to convert
  * @param palette    array with [256] entries, which must match color arrangement (RGB or BGR) of src
  *)
-procedure sws_convertPalette8ToPacked24({const} src:      PPCuint8Array;
-                                         dst:             PPCuint8Array;
-					 num_pixels:      cint;
-					 {const} palette: PPCuint8Array);
+procedure sws_convertPalette8ToPacked24({const} src:     PPCuint8Array;
+                                        dst:             PPCuint8Array;
+                                        num_pixels:      cint;
+                                        {const} palette: PPCuint8Array);
   cdecl; external sw__scale;
 
 implementation
diff --git a/src/lib/ffmpeg-0.9/avcodec.pas b/src/lib/ffmpeg-0.9/avcodec.pas
index 1d96e6fa..35ea05f8 100644
--- a/src/lib/ffmpeg-0.9/avcodec.pas
+++ b/src/lib/ffmpeg-0.9/avcodec.pas
@@ -22,7 +22,7 @@
  * - Changes and updates by the UltraStar Deluxe Team
  *
  * Conversion of libavcodec/avcodec.h
- * version: 52.122.0
+ * version: 53.42.0 - 53.42.4
  *
  *)
 
@@ -79,16 +79,16 @@ const
    * fix. 
    *)
   (* Supported version by this header *)
-  LIBAVCODEC_MAX_VERSION_MAJOR   = 52;
-  LIBAVCODEC_MAX_VERSION_MINOR   = 122;
-  LIBAVCODEC_MAX_VERSION_RELEASE = 0;
+  LIBAVCODEC_MAX_VERSION_MAJOR   = 53;
+  LIBAVCODEC_MAX_VERSION_MINOR   = 42;
+  LIBAVCODEC_MAX_VERSION_RELEASE = 4;
   LIBAVCODEC_MAX_VERSION = (LIBAVCODEC_MAX_VERSION_MAJOR * VERSION_MAJOR) +
                            (LIBAVCODEC_MAX_VERSION_MINOR * VERSION_MINOR) +
                            (LIBAVCODEC_MAX_VERSION_RELEASE * VERSION_RELEASE);
 
   (* Min. supported version by this header *)
-  LIBAVCODEC_MIN_VERSION_MAJOR   = 52;
-  LIBAVCODEC_MIN_VERSION_MINOR   = 122;
+  LIBAVCODEC_MIN_VERSION_MAJOR   = 53;
+  LIBAVCODEC_MIN_VERSION_MINOR   = 42;
   LIBAVCODEC_MIN_VERSION_RELEASE = 0;
   LIBAVCODEC_MIN_VERSION = (LIBAVCODEC_MIN_VERSION_MAJOR * VERSION_MAJOR) +
                             (LIBAVCODEC_MIN_VERSION_MINOR * VERSION_MINOR) +
@@ -96,12 +96,12 @@ const
 
 (* Check if linked versions are supported *)
 {$IF (LIBAVCODEC_VERSION < LIBAVCODEC_MIN_VERSION)}
-//  {$MESSAGE Error 'Linked version of libavcodec is too old!'}
+  {$MESSAGE Error 'Linked version of libavcodec is too old!'}
 {$IFEND}
 
 (* Check if linked version is supported *)
 {$IF (LIBAVCODEC_VERSION > LIBAVCODEC_MAX_VERSION)}
-//  {$MESSAGE Error 'Linked version of libavcodec is not yet supported!'}
+  {$MESSAGE Error 'Linked version of libavcodec is not yet supported!'}
 {$IFEND}
 
 (**
@@ -175,7 +175,7 @@ const
 
 {$IF FF_API_OLD_AUDIOCONVERT}
   {$I libavcodec/audioconvert.pas}
-{$ENDIF}
+{$IFEND}
 
 const
   AV_NOPTS_VALUE: cint64  = $8000000000000000;
@@ -301,7 +301,7 @@ type
     CODEC_ID_GIF,
 {$IF LIBAVCODEC_VERSION_MAJOR = 53}
     CODEC_ID_FFH264,
-{$ENDIF}
+{$IFEND}
     CODEC_ID_DXA,
     CODEC_ID_DNXHD,
     CODEC_ID_THP,
@@ -322,7 +322,7 @@ type
 {$IF LIBAVCODEC_VERSION_MAJOR = 53}
     CODEC_ID_8SVX_EXP,
     CODEC_ID_8SVX_FIB,
-{$ENDIF}
+{$IFEND}
     CODEC_ID_ESCAPE124,
     CODEC_ID_DIRAC,
     CODEC_ID_BFI,
@@ -364,7 +364,7 @@ type
 {$IF LIBAVCODEC_VERSION_MAJOR = 53}
     CODEC_ID_G723_1_DEPRECATED,
     CODEC_ID_G729_DEPRECATED,
-{$ENDIF}
+{$IFEND}
     CODEC_ID_UTVIDEO_DEPRECATED,
     CODEC_ID_BMV_VIDEO,
     CODEC_ID_VBLE,
@@ -465,7 +465,7 @@ type
 {$IF LIBAVCODEC_VERSION_MAJOR = 53}
     CODEC_ID_SONIC,
     CODEC_ID_SONIC_LS,
-{$ENDIF}
+{$IFEND}
     CODEC_ID_FLAC,
     CODEC_ID_MP3ADU,
     CODEC_ID_MP3ON4,
@@ -512,7 +512,7 @@ type
     CODEC_ID_G729_DEPRECATED,
     CODEC_ID_8SVX_EXP,
     CODEC_ID_8SVX_FIB,
-{$ENDIF}
+{$IFEND}
     CODEC_ID_BMV_AUDIO,
     CODEC_ID_G729 = $15800,
     CODEC_ID_G723_1= $15801,
@@ -556,7 +556,7 @@ type
 
   );
 
-{$IFDEF FF_API_OLD_SAMPLE_FMT}
+{$IF FF_API_OLD_SAMPLE_FMT}
 type
   TSampleFormat = TAVSampleFormat;
 
@@ -568,9 +568,9 @@ const
   SAMPLE_FMT_FLT  = AV_SAMPLE_FMT_FLT;
   SAMPLE_FMT_DBL  = AV_SAMPLE_FMT_DBL;
   SAMPLE_FMT_NB   = AV_SAMPLE_FMT_NB;
-{$ENDIF}
+{$IFEND}
 
-{$IFDEF FF_API_OLD_AUDIOCONVERT}
+{$IF FF_API_OLD_AUDIOCONVERT}
 
 const
   {* Audio channel masks *}
@@ -617,7 +617,7 @@ const
   CH_LAYOUT_7POINT1         = AV_CH_LAYOUT_7POINT1;
   CH_LAYOUT_7POINT1_WIDE    = AV_CH_LAYOUT_7POINT1_WIDE;
   CH_LAYOUT_STEREO_DOWNMIX  = AV_CH_LAYOUT_STEREO_DOWNMIX;
-{$ENDIF}
+{$IFEND}
 
 {$IFDEF FF_API_OLD_DECODE_AUDIO}
 {* in bytes *}
@@ -723,7 +723,7 @@ type
     AVCHROMA_LOC_NB               ///< Not part of ABI
   );
 
-{$IFDEF FF_API_FLAC_GLOBAL_OPTS}
+{$IF FF_API_FLAC_GLOBAL_OPTS}
 (**
  * LPC analysis type
  *)
@@ -735,7 +735,7 @@ type
     AV_LPC_TYPE_CHOLESKY    =  3, ///< Cholesky factorization
     AV_LPC_TYPE_NB                ///< Not part of ABI
   );
-{$ENDIF}
+{$IFEND}
 
   TAVAudioServiceType =(
     AV_AUDIO_SERVICE_TYPE_MAIN              = 0,
diff --git a/src/lib/ffmpeg-0.9/avformat.pas b/src/lib/ffmpeg-0.9/avformat.pas
index 499361d1..7d8b4f15 100644
--- a/src/lib/ffmpeg-0.9/avformat.pas
+++ b/src/lib/ffmpeg-0.9/avformat.pas
@@ -83,7 +83,7 @@ const
 
 (* Check if linked versions are supported *)
 {$IF (LIBAVFORMAT_VERSION > LIBAVFORMAT_MAX_VERSION)}
-//  {$MESSAGE Error 'Linked version of libavformat is not yet supported!'}
+  {$MESSAGE Error 'Linked version of libavformat is not yet supported!'}
 {$IFEND}
 
 {
@@ -240,7 +240,7 @@ procedure av_metadata_copy(var dst: PAVDictionary; src: PAVDictionary; flags: ci
 procedure av_metadata_free(var m: PAVDictionary);
   cdecl; external av__format; deprecated;
 
-{$ENDIF}
+{$IFEND}
 
 (* packet functions *)
 
@@ -492,7 +492,7 @@ type
 
 {$IF FF_API_OLD_METADATA2}
     {const} metadata_conv: PAVMetadataConv;
-{$ENDIF}
+{$IFEND}
 
     {const} priv_class: PAVClass; ///< AVClass for the private context
 
@@ -580,7 +580,7 @@ type
      *)
     read_seek: function (c: PAVFormatContext; stream_index: cint;
                   timestamp: cint64; flags: cint): cint; cdecl; deprecated;
-{$ENDIF}
+{$IFEND}
 
     (**
      * Gets the next timestamp in stream[stream_index].time_base units.
diff --git a/src/lib/ffmpeg-0.9/avio.pas b/src/lib/ffmpeg-0.9/avio.pas
index 946f104b..b913d72f 100644
--- a/src/lib/ffmpeg-0.9/avio.pas
+++ b/src/lib/ffmpeg-0.9/avio.pas
@@ -130,7 +130,7 @@ type
  *)
   PAVIOContext = ^TAVIOContext;
   TAVIOContext = record
-{$IFNDEF FF_API_OLD_AVIO}
+{$IF FF_API_OLD_AVIO}
     (**
      * A class for private options.
      *
@@ -144,7 +144,7 @@ type
      * to any av_opt_* functions in that case.
      *)
     av_class: PAVClass;
-{$ENDIF}
+{$IFEND}
     buffer: PByteArray;  (**< Start of the buffer. *)
     buffer_size: cint;   (**< Maximum buffer size *)
     buf_ptr: PByteArray; (**< Current position in the buffer *)
@@ -163,7 +163,7 @@ type
     write_flag: cint;    (**< true if open for writing *)
 {$IF FF_API_OLD_AVIO}
     is_streamed: cint; { deprecated }
-{$ENDIF}
+{$IFEND}
     max_packet_size: cint;
     checksum: culong;
     checksum_ptr: PByteArray;
@@ -522,7 +522,7 @@ function url_close_buf(s: PAVIOContext): cint;
  *)
 function url_exist(url: {const} PAnsiChar): cint;
   cdecl; external av__format; deprecated;
-{$ENDIF} // FF_API_OLD_AVIO
+{$IFEND} // FF_API_OLD_AVIO
 
 (**
  * Return AVIO_FLAG_* access flags corresponding to the access permissions
@@ -540,7 +540,7 @@ function url_exist(url: {const} PAnsiChar): cint;
 function avio_check(url: {const} PAnsiChar; flags: cint): cint;
   cdecl; external av__format;
 
-{$IFDEF FF_API_OLD_INTERRUPT_CB}
+{$IF FF_API_OLD_INTERRUPT_CB}
 (**
  * The callback is called in blocking functions to test regulary if
  * asynchronous interruption is needed. AVERROR_EXIT is returned
@@ -894,7 +894,7 @@ function url_is_streamed(s: PAVIOContext): cint;
 begin
   Result := s^.is_streamed;
 end;
-{$ENDIF}
+{$IFEND}
 
 (**
  * For SEEK_CUR on Windows
diff --git a/src/lib/ffmpeg-0.9/avutil.pas b/src/lib/ffmpeg-0.9/avutil.pas
index d9c98726..9a2ef4ed 100644
--- a/src/lib/ffmpeg-0.9/avutil.pas
+++ b/src/lib/ffmpeg-0.9/avutil.pas
@@ -71,11 +71,11 @@ const
 
 (* Check if linked versions are supported *)
 {$IF (LIBAVUTIL_VERSION < LIBAVUTIL_MIN_VERSION)}
-//  {$MESSAGE Error 'Linked version of libavutil is too old!'}
+  {$MESSAGE Error 'Linked version of libavutil is too old!'}
 {$IFEND}
 
 {$IF (LIBAVUTIL_VERSION > LIBAVUTIL_MAX_VERSION)}
-//  {$MESSAGE Error 'Linked version of libavutil is not yet supported!'}
+  {$MESSAGE Error 'Linked version of libavutil is not yet supported!'}
 {$IFEND}
 
 (**
diff --git a/src/lib/ffmpeg-0.9/swscale.pas b/src/lib/ffmpeg-0.9/swscale.pas
index fd5dc180..c26f66c5 100644
--- a/src/lib/ffmpeg-0.9/swscale.pas
+++ b/src/lib/ffmpeg-0.9/swscale.pas
@@ -80,7 +80,7 @@ const
 
 (* Check if linked versions are supported *)
 {$IF (LIBSWSCALE_VERSION > LIBSWSCALE_MAX_VERSION)}
-//  {$MESSAGE Error 'Linked version of libswscale is not yet supported!'}
+  {$MESSAGE Error 'Linked version of libswscale is not yet supported!'}
 {$IFEND}
 
 type
@@ -102,7 +102,7 @@ const
 {$ifndef FF_API_SWS_CPU_CAPS}
   FF_API_SWS_CPU_CAPS = LIBSWSCALE_VERSION_MAJOR < 3;    
 {$endif}
-{$ifndef FF_API_SWS_GETCONTEXT}
+{$ifndef FF_API_SWS_FORMAT_NAME}
   FF_API_SWS_FORMAT_NAME = LIBSWSCALE_VERSION_MAJOR < 3;    
 {$endif}
 
@@ -165,7 +165,7 @@ const
   SWS_CPU_CAPS_ALTIVEC  = $10000000;
   SWS_CPU_CAPS_BFIN     = $01000000;
   SWS_CPU_CAPS_SSE2     = $02000000;
-{$ENDIF}
+{$IFEND}
 
   SWS_MAX_REDUCE_CUTOFF = 0.002;
 
@@ -271,7 +271,7 @@ function sws_getContext(srcW: cint; srcH: cint; srcFormat: TAVPixelFormat;
                         flags: cint; srcFilter: PSwsFilter;
                         dstFilter: PSwsFilter; param: PCdouble): PSwsContext;
   cdecl; external sw__scale;
-{$ENDIF}
+{$IFEND}
 
 (**
  * Scales the image slice in srcSlice and puts the resulting scaled
diff --git a/src/lib/ffmpeg/avutil.pas b/src/lib/ffmpeg/avutil.pas
index 2f8c79f7..c02ac4cb 100644
--- a/src/lib/ffmpeg/avutil.pas
+++ b/src/lib/ffmpeg/avutil.pas
@@ -326,8 +326,13 @@ const
 
 (* libavutil/common.h *) // until now MKTAG and MKBETAG is all from common.h KMS 19/5/2010
 
-function MKTAG(a, b, c, d: AnsiChar): integer;
-function MKBETAG(a, b, c, d: AnsiChar): integer;
+(**
+ * MKTAG and MKBETAG are usually used to convert a magic string to an enumeration index.
+ * In Pascal this can probably not be used and the functions could be removed.
+ * KMS 8/6/2012
+ *)
+function MKTAG(a, b, c, d: AnsiChar): integer; {$IFDEF HasInline}inline;{$ENDIF}
+function MKBETAG(a, b, c, d: AnsiChar): integer; {$IFDEF HasInline}inline;{$ENDIF}
 
 (* libavutil/mem.h *)
 
@@ -491,12 +496,12 @@ implementation
 
 (* libavutil/common.h *)
 
-function MKTAG(a, b, c, d: AnsiChar): integer;
+function MKTAG(a, b, c, d: AnsiChar): integer; {$IFDEF HasInline}inline;{$ENDIF}
 begin
   Result := (ord(a) or (ord(b) shl 8) or (ord(c) shl 16) or (ord(d) shl 24));
 end;
 
-function MKBETAG(a, b, c, d: AnsiChar): integer;
+function MKBETAG(a, b, c, d: AnsiChar): integer; {$IFDEF HasInline}inline;{$ENDIF}
 begin
   Result := (ord(d) or (ord(c) shl 8) or (ord(b) shl 16) or (ord(a) shl 24));
 end;
diff --git a/src/lib/ffmpeg/swscale.pas b/src/lib/ffmpeg/swscale.pas
index 7289e902..9a18d283 100644
--- a/src/lib/ffmpeg/swscale.pas
+++ b/src/lib/ffmpeg/swscale.pas
@@ -233,8 +233,8 @@ procedure sws_freeContext(swsContext: PSwsContext);
  *)
 function sws_getContext(srcW: cint; srcH: cint; srcFormat: TAVPixelFormat;
                         dstW: cint; dstH: cint; dstFormat: TAVPixelFormat;
-	                flags: cint; srcFilter: PSwsFilter;
-	                dstFilter: PSwsFilter; param: PCdouble): PSwsContext;
+                        flags: cint; srcFilter: PSwsFilter;
+                        dstFilter: PSwsFilter; param: PCdouble): PSwsContext;
   cdecl; external sw__scale;
 
 (**
@@ -271,7 +271,7 @@ function sws_scale(context: PSwsContext; {const} srcSlice: PPCuint8Array; {const
 // deprecated. Use sws_scale() instead.
 function sws_scale_ordered(context: PSwsContext; {const} src: PPCuint8Array;
                            srcStride: PCintArray; srcSliceY: cint; srcSliceH: cint;
-	                   dst: PPCuint8Array; dstStride: PCintArray): cint;
+                           dst: PPCuint8Array; dstStride: PCintArray): cint;
   cdecl; external sw__scale; deprecated;
 {$IFEND}
 
@@ -359,7 +359,7 @@ procedure sws_printVec(a: PSwsVector);
  *)
 procedure sws_printVec2(a:         PSwsVector;
                         log_ctx:   PAVClass; // PAVClass is declared in avcodec.pas
-			log_level: cint);
+                        log_level: cint);
   cdecl; external sw__scale;
 {$IFEND}
 
@@ -368,8 +368,8 @@ procedure sws_freeVec(a: PSwsVector);
 
 function sws_getDefaultFilter(lumaGBlur: cfloat; chromaGBlur: cfloat; 
                               lumaSharpen: cfloat; chromaSharpen: cfloat;
-			      chromaHShift: cfloat; chromaVShift: cfloat;
-			      verbose: cint): PSwsFilter;
+                              chromaHShift: cfloat; chromaVShift: cfloat;
+                              verbose: cint): PSwsFilter;
   cdecl; external sw__scale;
 
 procedure sws_freeFilter(filter: PSwsFilter);
@@ -391,8 +391,8 @@ procedure sws_freeFilter(filter: PSwsFilter);
 function sws_getCachedContext(context: PSwsContext;
               srcW: cint; srcH: cint; srcFormat: TAVPixelFormat;
               dstW: cint; dstH: cint; dstFormat: TAVPixelFormat;
-	      flags: cint; srcFilter: PSwsFilter; 
-	      dstFilter: PSwsFilter; param: PCdouble): PSwsContext;
+              flags: cint; srcFilter: PSwsFilter; 
+              dstFilter: PSwsFilter; param: PCdouble): PSwsContext;
   cdecl; external sw__scale;
 
 {$IF LIBSWSCALE_VERSION >= 000011000} // >= 0.11.0
@@ -406,10 +406,10 @@ function sws_getCachedContext(context: PSwsContext;
  * @param num_pixels number of pixels to convert
  * @param palette    array with [256] entries, which must match color arrangement (RGB or BGR) of src
  *)
-procedure sws_convertPalette8ToPacked32({const} src:      PPCuint8Array;
-                                         dst:             PPCuint8Array;
-					 num_pixels:      clong;
-					 {const} palette: PPCuint8Array);
+procedure sws_convertPalette8ToPacked32({const} src:     PPCuint8Array;
+                                        dst:             PPCuint8Array;
+                                        num_pixels:      clong;
+                                        {const} palette: PPCuint8Array);
   cdecl; external sw__scale;
 
 (**
@@ -422,10 +422,10 @@ procedure sws_convertPalette8ToPacked32({const} src:      PPCuint8Array;
  * @param num_pixels number of pixels to convert
  * @param palette    array with [256] entries, which must match color arrangement (RGB or BGR) of src
  *)
-procedure sws_convertPalette8ToPacked24({const} src:      PPCuint8Array;
-                                         dst:             PPCuint8Array;
-					 num_pixels:      clong;
-					 {const} palette: PPCuint8Array);
+procedure sws_convertPalette8ToPacked24({const} src:     PPCuint8Array;
+                                        dst:             PPCuint8Array;
+                                        num_pixels:      clong;
+                                        {const} palette: PPCuint8Array);
   cdecl; external sw__scale;
 {$IFEND}