From 1ba91d5a0e1df7419a561f6dcf16a0839509a5e7 Mon Sep 17 00:00:00 2001
From: k-m_schindler <k-m_schindler@b956fd51-792f-4845-bead-9b4dfca2ff2c>
Date: Wed, 27 Aug 2008 13:28:57 +0000
Subject: Reordering of the directories[1]: moving Game/Code to src

git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@1302 b956fd51-792f-4845-bead-9b4dfca2ff2c
---
 src/lib/ffmpeg/avutil.pas | 320 ++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 320 insertions(+)
 create mode 100644 src/lib/ffmpeg/avutil.pas

(limited to 'src/lib/ffmpeg/avutil.pas')

diff --git a/src/lib/ffmpeg/avutil.pas b/src/lib/ffmpeg/avutil.pas
new file mode 100644
index 00000000..17ae141a
--- /dev/null
+++ b/src/lib/ffmpeg/avutil.pas
@@ -0,0 +1,320 @@
+(*
+ * copyright (c) 2006 Michael Niedermayer <michaelni@gmx.at>
+ *
+ * This library 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
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * 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.
+ * - 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.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
+ *
+ * libavutil/log.h:
+ *  revision 13068, Tue May 6 08:41:13 2008 UTC
+ *)
+
+unit avutil;
+
+{$IFDEF FPC}
+  {$MODE DELPHI}
+  {$PACKENUM 4}    (* use 4-byte enums *)
+  {$PACKRECORDS C} (* C/C++-compatible record packing *)
+{$ELSE}
+  {$MINENUMSIZE 4} (* use 4-byte enums *)
+{$ENDIF}
+
+{$IFDEF DARWIN}
+  {$linklib libavutil}
+{$ENDIF}
+
+interface
+
+uses
+  ctypes,
+  mathematics,
+  rational,
+  UConfig;
+
+const
+  (* Max. supported version by this header *)
+  LIBAVUTIL_MAX_VERSION_MAJOR   = 49;
+  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) +
+                          (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}
+
+{$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:
+ *
+ * PIX_FMT_RGB32 is handled in an endian-specific manner. A RGBA
+ * color is put together as:
+ *  (A << 24) | (R << 16) | (G << 8) | B
+ * This is stored as BGRA on little endian CPU architectures and ARGB on
+ * big endian CPUs.
+ *
+ * When the pixel format is palettized RGB (PIX_FMT_PAL8), the palettized
+ * image data is stored in AVFrame.data[0]. The palette is transported in
+ * AVFrame.data[1] and, is 1024 bytes long (256 4-byte entries) and is
+ * formatted the same as in PIX_FMT_RGB32 described above (i.e., it is
+ * also endian-specific). Note also that the individual RGB palette
+ * components stored in AVFrame.data[1] should be in the range 0..255.
+ * This is important as many custom PAL8 video codecs that were designed
+ * to run on the IBM VGA graphics adapter use 6-bit palette components.
+ *)
+
+  PAVPixelFormat = ^TAVPixelFormat;
+  TAVPixelFormat = (
+    PIX_FMT_NONE= -1,
+    PIX_FMT_YUV420P,   ///< Planar YUV 4:2:0, 12bpp, (1 Cr & Cb sample per 2x2 Y samples)
+    PIX_FMT_YUYV422,   ///< Packed YUV 4:2:2, 16bpp, Y0 Cb Y1 Cr
+    PIX_FMT_RGB24,     ///< Packed RGB 8:8:8, 24bpp, RGBRGB...
+    PIX_FMT_BGR24,     ///< Packed RGB 8:8:8, 24bpp, BGRBGR...
+    PIX_FMT_YUV422P,   ///< Planar YUV 4:2:2, 16bpp, (1 Cr & Cb sample per 2x1 Y samples)
+    PIX_FMT_YUV444P,   ///< Planar YUV 4:4:4, 24bpp, (1 Cr & Cb sample per 1x1 Y samples)
+    PIX_FMT_RGB32,     ///< Packed RGB 8:8:8, 32bpp, (msb)8A 8R 8G 8B(lsb), in cpu endianness
+    PIX_FMT_YUV410P,   ///< Planar YUV 4:1:0,  9bpp, (1 Cr & Cb sample per 4x4 Y samples)
+    PIX_FMT_YUV411P,   ///< Planar YUV 4:1:1, 12bpp, (1 Cr & Cb sample per 4x1 Y samples)
+    PIX_FMT_RGB565,    ///< Packed RGB 5:6:5, 16bpp, (msb)   5R 6G 5B(lsb), in cpu endianness
+    PIX_FMT_RGB555,    ///< Packed RGB 5:5:5, 16bpp, (msb)1A 5R 5G 5B(lsb), in cpu endianness most significant bit to 1
+    PIX_FMT_GRAY8,     ///<        Y        ,  8bpp
+    PIX_FMT_MONOWHITE, ///<        Y        ,  1bpp, 0 is white, 1 is black
+    PIX_FMT_MONOBLACK, ///<        Y        ,  1bpp, 0 is black, 1 is white
+    PIX_FMT_PAL8,      ///< 8 bit with PIX_FMT_RGB32 palette
+    PIX_FMT_YUVJ420P,  ///< Planar YUV 4:2:0, 12bpp, full scale (jpeg)
+    PIX_FMT_YUVJ422P,  ///< Planar YUV 4:2:2, 16bpp, full scale (jpeg)
+    PIX_FMT_YUVJ444P,  ///< Planar YUV 4:4:4, 24bpp, full scale (jpeg)
+    PIX_FMT_XVMC_MPEG2_MC,///< XVideo Motion Acceleration via common packet passing(xvmc_render.h)
+    PIX_FMT_XVMC_MPEG2_IDCT,
+    PIX_FMT_UYVY422,   ///< Packed YUV 4:2:2, 16bpp, Cb Y0 Cr Y1
+    PIX_FMT_UYYVYY411, ///< Packed YUV 4:1:1, 12bpp, Cb Y0 Y1 Cr Y2 Y3
+    PIX_FMT_BGR32,     ///< Packed RGB 8:8:8, 32bpp, (msb)8A 8B 8G 8R(lsb), in cpu endianness
+    PIX_FMT_BGR565,    ///< Packed RGB 5:6:5, 16bpp, (msb)   5B 6G 5R(lsb), in cpu endianness
+    PIX_FMT_BGR555,    ///< Packed RGB 5:5:5, 16bpp, (msb)1A 5B 5G 5R(lsb), in cpu endianness most significant bit to 1
+    PIX_FMT_BGR8,      ///< Packed RGB 3:3:2,  8bpp, (msb)2B 3G 3R(lsb)
+    PIX_FMT_BGR4,      ///< Packed RGB 1:2:1,  4bpp, (msb)1B 2G 1R(lsb)
+    PIX_FMT_BGR4_BYTE, ///< Packed RGB 1:2:1,  8bpp, (msb)1B 2G 1R(lsb)
+    PIX_FMT_RGB8,      ///< Packed RGB 3:3:2,  8bpp, (msb)2R 3G 3B(lsb)
+    PIX_FMT_RGB4,      ///< Packed RGB 1:2:1,  4bpp, (msb)2R 3G 3B(lsb)
+    PIX_FMT_RGB4_BYTE, ///< Packed RGB 1:2:1,  8bpp, (msb)2R 3G 3B(lsb)
+    PIX_FMT_NV12,      ///< Planar YUV 4:2:0, 12bpp, 1 plane for Y and 1 for UV
+    PIX_FMT_NV21,      ///< as above, but U and V bytes are swapped
+
+    PIX_FMT_RGB32_1,   ///< Packed RGB 8:8:8, 32bpp, (msb)8R 8G 8B 8A(lsb), in cpu endianness
+    PIX_FMT_BGR32_1,   ///< Packed RGB 8:8:8, 32bpp, (msb)8B 8G 8R 8A(lsb), in cpu endianness
+
+    PIX_FMT_GRAY16BE,  ///<        Y        , 16bpp, big-endian
+    PIX_FMT_GRAY16LE,  ///<        Y        , 16bpp, little-endian
+    PIX_FMT_YUV440P,   ///< Planar YUV 4:4:0 (1 Cr & Cb sample per 1x2 Y samples)
+    PIX_FMT_YUVJ440P,  ///< Planar YUV 4:4:0 full scale (jpeg)
+    PIX_FMT_YUVA420P,  ///< Planar YUV 4:2:0, 20bpp, (1 Cr & Cb sample per 2x2 Y & A samples)
+    PIX_FMT_NB         ///< number of pixel formats, DO NOT USE THIS if you want to link with shared libav* because the number of formats might differ between versions
+  );
+
+const
+{$ifdef WORDS_BIGENDIAN}
+  PIX_FMT_RGBA = PIX_FMT_RGB32_1;
+  PIX_FMT_BGRA = PIX_FMT_BGR32_1;
+  PIX_FMT_ARGB = PIX_FMT_RGB32;
+  PIX_FMT_ABGR = PIX_FMT_BGR32;
+  PIX_FMT_GRAY16 = PIX_FMT_GRAY16BE;
+{$else}
+  PIX_FMT_RGBA = PIX_FMT_BGR32;
+  PIX_FMT_BGRA = PIX_FMT_RGB32;
+  PIX_FMT_ARGB = PIX_FMT_BGR32_1;
+  PIX_FMT_ABGR = PIX_FMT_RGB32_1;
+  PIX_FMT_GRAY16 = PIX_FMT_GRAY16LE;
+{$endif}
+
+{$IF LIBAVUTIL_VERSION_MAJOR < 50} // 50.0.0
+  PIX_FMT_UYVY411 = PIX_FMT_UYYVYY411;
+  PIX_FMT_RGBA32  = PIX_FMT_RGB32;
+  PIX_FMT_YUV422  = PIX_FMT_YUYV422;
+{$IFEND}
+
+(* common.h *)
+
+function MKTAG(a,b,c,d: char): integer;
+
+(* mem.h *)
+
+(**
+ * Allocate a block of \p size bytes with alignment suitable for all
+ * memory accesses (including vectors if available on the CPU).
+ * @param size Size in bytes for the memory block to be allocated.
+ * @return Pointer to the allocated block, NULL if it cannot allocate
+ * it.
+ * @see av_mallocz()
+ *)
+function av_malloc(size: cuint): pointer;
+  cdecl; external av__util; {av_malloc_attrib av_alloc_size(1)}
+
+(**
+ * Allocate or reallocate a block of memory.
+ * If \p ptr is NULL and \p size > 0, allocate a new block. If \p
+ * size is zero, free the memory block pointed by \p ptr.
+ * @param size Size in bytes for the memory block to be allocated or
+ * reallocated.
+ * @param ptr Pointer to a memory block already allocated with
+ * av_malloc(z)() or av_realloc() or NULL.
+ * @return Pointer to a newly reallocated block or NULL if it cannot
+ * reallocate or the function is used to free the memory block.
+ * @see av_fast_realloc()
+ *)
+function av_realloc(ptr: pointer; size: cuint): pointer;
+  cdecl; external av__util; {av_alloc_size(2)}
+
+(**
+ * Free a memory block which has been allocated with av_malloc(z)() or
+ * av_realloc().
+ * @param ptr Pointer to the memory block which should be freed.
+ * @note ptr = NULL is explicitly allowed.
+ * @note It is recommended that you use av_freep() instead.
+ * @see av_freep()
+ *)
+procedure av_free(ptr: pointer);
+  cdecl; external av__util;
+
+(**
+ * Allocate a block of \p size bytes with alignment suitable for all
+ * memory accesses (including vectors if available on the CPU) and
+ * set to zeroes all the bytes of the block.
+ * @param size Size in bytes for the memory block to be allocated.
+ * @return Pointer to the allocated block, NULL if it cannot allocate
+ * it.
+ * @see av_malloc()
+ *)
+function av_mallocz(size: cuint): pointer;
+  cdecl; external av__util; {av_malloc_attrib av_alloc_size(1)}
+
+(**
+ * Duplicate the string \p s.
+ * @param s String to be duplicated.
+ * @return Pointer to a newly allocated string containing a
+ * copy of \p s or NULL if it cannot be allocated.
+ *)
+function av_strdup({const} s: PChar): PChar;
+  cdecl; external av__util; {av_malloc_attrib}
+
+(**
+ * Free a memory block which has been allocated with av_malloc(z)() or
+ * av_realloc() and set to NULL the pointer to it.
+ * @param ptr Pointer to the pointer to the memory block which should
+ * be freed.
+ * @see av_free()
+ *)
+procedure av_freep (ptr: pointer);
+  cdecl; external av__util;
+
+(* log.h *)
+
+const
+{$IF LIBAVUTIL_VERSION_MAJOR < 50}
+  AV_LOG_QUIET   = -1;
+  AV_LOG_FATAL   =  0;
+  AV_LOG_ERROR   =  0;
+  AV_LOG_WARNING =  1;
+  AV_LOG_INFO    =  1;
+  AV_LOG_VERBOSE =  1;
+  AV_LOG_DEBUG   =  2;
+{$ELSE}
+  AV_LOG_QUIET   = -8;
+
+(**
+ * something went really wrong and we will crash now
+ *)
+  AV_LOG_PANIC   =  0;
+
+(**
+ * something went wrong and recovery is not possible
+ * like no header in a format which depends on it or a combination
+ * of parameters which are not allowed
+ *)
+  AV_LOG_FATAL   =  8;
+
+(**
+ * something went wrong and cannot losslessly be recovered
+ * but not all future data is affected
+ *)
+  AV_LOG_ERROR   = 16;
+
+(**
+ * something somehow does not look correct / something which may or may not
+ * lead to some problems like use of -vstrict -2
+ *)
+  AV_LOG_WARNING = 24;
+
+  AV_LOG_INFO    = 32;
+  AV_LOG_VERBOSE = 40;
+
+(**
+ * stuff which is only useful for libav* developers
+ *)
+  AV_LOG_DEBUG   = 48;
+{$IFEND}
+
+function av_log_get_level(): cint;
+  cdecl; external av__util;
+procedure av_log_set_level(level: cint);
+  cdecl; external av__util;
+
+
+implementation
+
+function MKTAG(a,b,c,d: char): integer;
+begin
+  Result := (ord(a) or (ord(b) shl 8) or (ord(c) shl 16) or (ord(d) shl 24));
+end;
+
+end.
-- 
cgit v1.2.3


From 08a0ddf3d8f9eb819e03d9cd6c8d79bd8634fec6 Mon Sep 17 00:00:00 2001
From: tobigun <tobigun@b956fd51-792f-4845-bead-9b4dfca2ff2c>
Date: Wed, 1 Oct 2008 12:28:15 +0000
Subject: - FFmpeg header update   - update to newest revision   - if linked
 libs are too new, USDX will not compile anymore and display an error message
 (to avoid mysterious crashes if an unsupported version of FFmpeg is used) -
 comment change in UVisualizer.pas

git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@1428 b956fd51-792f-4845-bead-9b4dfca2ff2c
---
 src/lib/ffmpeg/avutil.pas | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

(limited to 'src/lib/ffmpeg/avutil.pas')

diff --git a/src/lib/ffmpeg/avutil.pas b/src/lib/ffmpeg/avutil.pas
index 17ae141a..b4fae422 100644
--- a/src/lib/ffmpeg/avutil.pas
+++ b/src/lib/ffmpeg/avutil.pas
@@ -29,13 +29,13 @@
  *
  * libavutil/avutil.h:
  *  Min. version: 49.0.1, revision 6577,  Sat Oct 7 15:30:46 2006 UTC
- *  Max. version: 49.8.0, revision 14665, Fri Aug 8 18:32:20 2008 UTC
+ *  Max. version: 49.11.0, revision 15415, Thu Sep 25 19:23:13 2008 UTC 
  *
  * libavutil/mem.h:
- *  revision 13665, Thu Jun 5 19:49:47 2008 UTC
+ *  revision 15120, Sun Aug 31 07:39:47 2008 UTC 
  *
  * libavutil/log.h:
- *  revision 13068, Tue May 6 08:41:13 2008 UTC
+ *  revision 15120, Sun Aug 31 07:39:47 2008 UTC 
  *)
 
 unit avutil;
@@ -63,7 +63,7 @@ uses
 const
   (* Max. supported version by this header *)
   LIBAVUTIL_MAX_VERSION_MAJOR   = 49;
-  LIBAVUTIL_MAX_VERSION_MINOR   = 8;
+  LIBAVUTIL_MAX_VERSION_MINOR   = 11;
   LIBAVUTIL_MAX_VERSION_RELEASE = 0;
   LIBAVUTIL_MAX_VERSION = (LIBAVUTIL_MAX_VERSION_MAJOR * VERSION_MAJOR) +
                           (LIBAVUTIL_MAX_VERSION_MINOR * VERSION_MINOR) +
@@ -83,7 +83,7 @@ const
 {$IFEND}
 
 {$IF (LIBAVUTIL_VERSION > LIBAVUTIL_MAX_VERSION)}
-  {$MESSAGE Warn 'Linked version of libavutil may be unsupported!'}
+  {$MESSAGE Error 'Linked version of libavutil is not yet supported!'}
 {$IFEND}
 
 {$IF LIBAVUTIL_VERSION >= 49008000} // 49.8.0
@@ -146,8 +146,8 @@ type
     PIX_FMT_BGR4,      ///< Packed RGB 1:2:1,  4bpp, (msb)1B 2G 1R(lsb)
     PIX_FMT_BGR4_BYTE, ///< Packed RGB 1:2:1,  8bpp, (msb)1B 2G 1R(lsb)
     PIX_FMT_RGB8,      ///< Packed RGB 3:3:2,  8bpp, (msb)2R 3G 3B(lsb)
-    PIX_FMT_RGB4,      ///< Packed RGB 1:2:1,  4bpp, (msb)2R 3G 3B(lsb)
-    PIX_FMT_RGB4_BYTE, ///< Packed RGB 1:2:1,  8bpp, (msb)2R 3G 3B(lsb)
+    PIX_FMT_RGB4,      ///< Packed RGB 1:2:1,  4bpp, (msb)1R 2G 1B(lsb)
+    PIX_FMT_RGB4_BYTE, ///< Packed RGB 1:2:1,  8bpp, (msb)1R 2G 1B(lsb)
     PIX_FMT_NV12,      ///< Planar YUV 4:2:0, 12bpp, 1 plane for Y and 1 for UV
     PIX_FMT_NV21,      ///< as above, but U and V bytes are swapped
 
-- 
cgit v1.2.3


From e24412a795e205494d0a7420fd582841c1fc1dd4 Mon Sep 17 00:00:00 2001
From: tobigun <tobigun@b956fd51-792f-4845-bead-9b4dfca2ff2c>
Date: Wed, 4 Feb 2009 17:17:51 +0000
Subject: ffmpeg header update

git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@1581 b956fd51-792f-4845-bead-9b4dfca2ff2c
---
 src/lib/ffmpeg/avutil.pas | 89 +++++++++++++++++++++++++----------------------
 1 file changed, 47 insertions(+), 42 deletions(-)

(limited to 'src/lib/ffmpeg/avutil.pas')

diff --git a/src/lib/ffmpeg/avutil.pas b/src/lib/ffmpeg/avutil.pas
index b4fae422..6de35f1b 100644
--- a/src/lib/ffmpeg/avutil.pas
+++ b/src/lib/ffmpeg/avutil.pas
@@ -29,13 +29,13 @@
  *
  * libavutil/avutil.h:
  *  Min. version: 49.0.1, revision 6577,  Sat Oct 7 15:30:46 2006 UTC
- *  Max. version: 49.11.0, revision 15415, Thu Sep 25 19:23:13 2008 UTC 
+ *  Max. version: 49.14.0, revision 16912, Sun Feb 1 02:00:19 2009 UTC 
  *
  * libavutil/mem.h:
- *  revision 15120, Sun Aug 31 07:39:47 2008 UTC 
+ *  revision 16590, Tue Jan 13 23:44:16 2009 UTC 
  *
  * libavutil/log.h:
- *  revision 15120, Sun Aug 31 07:39:47 2008 UTC 
+ *  revision 16571, Tue Jan 13 00:14:43 2009 UTC 
  *)
 
 unit avutil;
@@ -63,7 +63,7 @@ uses
 const
   (* Max. supported version by this header *)
   LIBAVUTIL_MAX_VERSION_MAJOR   = 49;
-  LIBAVUTIL_MAX_VERSION_MINOR   = 11;
+  LIBAVUTIL_MAX_VERSION_MINOR   = 14;
   LIBAVUTIL_MAX_VERSION_RELEASE = 0;
   LIBAVUTIL_MAX_VERSION = (LIBAVUTIL_MAX_VERSION_MAJOR * VERSION_MAJOR) +
                           (LIBAVUTIL_MAX_VERSION_MINOR * VERSION_MINOR) +
@@ -98,15 +98,15 @@ type
 (**
  * Pixel format. Notes:
  *
- * PIX_FMT_RGB32 is handled in an endian-specific manner. A RGBA
+ * PIX_FMT_RGB32 is handled in an endian-specific manner. An RGBA
  * color is put together as:
  *  (A << 24) | (R << 16) | (G << 8) | B
- * This is stored as BGRA on little endian CPU architectures and ARGB on
- * big endian CPUs.
+ * This is stored as BGRA on little-endian CPU architectures and ARGB on
+ * big-endian CPUs.
  *
  * When the pixel format is palettized RGB (PIX_FMT_PAL8), the palettized
  * image data is stored in AVFrame.data[0]. The palette is transported in
- * AVFrame.data[1] and, is 1024 bytes long (256 4-byte entries) and is
+ * AVFrame.data[1], is 1024 bytes long (256 4-byte entries) and is
  * formatted the same as in PIX_FMT_RGB32 described above (i.e., it is
  * also endian-specific). Note also that the individual RGB palette
  * components stored in AVFrame.data[1] should be in the range 0..255.
@@ -117,48 +117,53 @@ type
   PAVPixelFormat = ^TAVPixelFormat;
   TAVPixelFormat = (
     PIX_FMT_NONE= -1,
-    PIX_FMT_YUV420P,   ///< Planar YUV 4:2:0, 12bpp, (1 Cr & Cb sample per 2x2 Y samples)
-    PIX_FMT_YUYV422,   ///< Packed YUV 4:2:2, 16bpp, Y0 Cb Y1 Cr
-    PIX_FMT_RGB24,     ///< Packed RGB 8:8:8, 24bpp, RGBRGB...
-    PIX_FMT_BGR24,     ///< Packed RGB 8:8:8, 24bpp, BGRBGR...
-    PIX_FMT_YUV422P,   ///< Planar YUV 4:2:2, 16bpp, (1 Cr & Cb sample per 2x1 Y samples)
-    PIX_FMT_YUV444P,   ///< Planar YUV 4:4:4, 24bpp, (1 Cr & Cb sample per 1x1 Y samples)
-    PIX_FMT_RGB32,     ///< Packed RGB 8:8:8, 32bpp, (msb)8A 8R 8G 8B(lsb), in cpu endianness
-    PIX_FMT_YUV410P,   ///< Planar YUV 4:1:0,  9bpp, (1 Cr & Cb sample per 4x4 Y samples)
-    PIX_FMT_YUV411P,   ///< Planar YUV 4:1:1, 12bpp, (1 Cr & Cb sample per 4x1 Y samples)
-    PIX_FMT_RGB565,    ///< Packed RGB 5:6:5, 16bpp, (msb)   5R 6G 5B(lsb), in cpu endianness
-    PIX_FMT_RGB555,    ///< Packed RGB 5:5:5, 16bpp, (msb)1A 5R 5G 5B(lsb), in cpu endianness most significant bit to 1
+    PIX_FMT_YUV420P,   ///< planar YUV 4:2:0, 12bpp, (1 Cr & Cb sample per 2x2 Y samples)
+    PIX_FMT_YUYV422,   ///< packed YUV 4:2:2, 16bpp, Y0 Cb Y1 Cr
+    PIX_FMT_RGB24,     ///< packed RGB 8:8:8, 24bpp, RGBRGB...
+    PIX_FMT_BGR24,     ///< packed RGB 8:8:8, 24bpp, BGRBGR...
+    PIX_FMT_YUV422P,   ///< planar YUV 4:2:2, 16bpp, (1 Cr & Cb sample per 2x1 Y samples)
+    PIX_FMT_YUV444P,   ///< planar YUV 4:4:4, 24bpp, (1 Cr & Cb sample per 1x1 Y samples)
+    PIX_FMT_RGB32,     ///< packed RGB 8:8:8, 32bpp, (msb)8A 8R 8G 8B(lsb), in CPU endianness
+    PIX_FMT_YUV410P,   ///< planar YUV 4:1:0,  9bpp, (1 Cr & Cb sample per 4x4 Y samples)
+    PIX_FMT_YUV411P,   ///< planar YUV 4:1:1, 12bpp, (1 Cr & Cb sample per 4x1 Y samples)
+    PIX_FMT_RGB565,    ///< packed RGB 5:6:5, 16bpp, (msb)   5R 6G 5B(lsb), in CPU endianness
+    PIX_FMT_RGB555,    ///< packed RGB 5:5:5, 16bpp, (msb)1A 5R 5G 5B(lsb), in CPU endianness, most significant bit to 0
     PIX_FMT_GRAY8,     ///<        Y        ,  8bpp
     PIX_FMT_MONOWHITE, ///<        Y        ,  1bpp, 0 is white, 1 is black
     PIX_FMT_MONOBLACK, ///<        Y        ,  1bpp, 0 is black, 1 is white
     PIX_FMT_PAL8,      ///< 8 bit with PIX_FMT_RGB32 palette
-    PIX_FMT_YUVJ420P,  ///< Planar YUV 4:2:0, 12bpp, full scale (jpeg)
-    PIX_FMT_YUVJ422P,  ///< Planar YUV 4:2:2, 16bpp, full scale (jpeg)
-    PIX_FMT_YUVJ444P,  ///< Planar YUV 4:4:4, 24bpp, full scale (jpeg)
+    PIX_FMT_YUVJ420P,  ///< planar YUV 4:2:0, 12bpp, full scale (JPEG)
+    PIX_FMT_YUVJ422P,  ///< planar YUV 4:2:2, 16bpp, full scale (JPEG)
+    PIX_FMT_YUVJ444P,  ///< planar YUV 4:4:4, 24bpp, full scale (JPEG)
     PIX_FMT_XVMC_MPEG2_MC,///< XVideo Motion Acceleration via common packet passing(xvmc_render.h)
     PIX_FMT_XVMC_MPEG2_IDCT,
-    PIX_FMT_UYVY422,   ///< Packed YUV 4:2:2, 16bpp, Cb Y0 Cr Y1
-    PIX_FMT_UYYVYY411, ///< Packed YUV 4:1:1, 12bpp, Cb Y0 Y1 Cr Y2 Y3
-    PIX_FMT_BGR32,     ///< Packed RGB 8:8:8, 32bpp, (msb)8A 8B 8G 8R(lsb), in cpu endianness
-    PIX_FMT_BGR565,    ///< Packed RGB 5:6:5, 16bpp, (msb)   5B 6G 5R(lsb), in cpu endianness
-    PIX_FMT_BGR555,    ///< Packed RGB 5:5:5, 16bpp, (msb)1A 5B 5G 5R(lsb), in cpu endianness most significant bit to 1
-    PIX_FMT_BGR8,      ///< Packed RGB 3:3:2,  8bpp, (msb)2B 3G 3R(lsb)
-    PIX_FMT_BGR4,      ///< Packed RGB 1:2:1,  4bpp, (msb)1B 2G 1R(lsb)
-    PIX_FMT_BGR4_BYTE, ///< Packed RGB 1:2:1,  8bpp, (msb)1B 2G 1R(lsb)
-    PIX_FMT_RGB8,      ///< Packed RGB 3:3:2,  8bpp, (msb)2R 3G 3B(lsb)
-    PIX_FMT_RGB4,      ///< Packed RGB 1:2:1,  4bpp, (msb)1R 2G 1B(lsb)
-    PIX_FMT_RGB4_BYTE, ///< Packed RGB 1:2:1,  8bpp, (msb)1R 2G 1B(lsb)
-    PIX_FMT_NV12,      ///< Planar YUV 4:2:0, 12bpp, 1 plane for Y and 1 for UV
+    PIX_FMT_UYVY422,   ///< packed YUV 4:2:2, 16bpp, Cb Y0 Cr Y1
+    PIX_FMT_UYYVYY411, ///< packed YUV 4:1:1, 12bpp, Cb Y0 Y1 Cr Y2 Y3
+    PIX_FMT_BGR32,     ///< packed RGB 8:8:8, 32bpp, (msb)8A 8B 8G 8R(lsb), in CPU endianness
+    PIX_FMT_BGR565,    ///< packed RGB 5:6:5, 16bpp, (msb)   5B 6G 5R(lsb), in CPU endianness
+    PIX_FMT_BGR555,    ///< packed RGB 5:5:5, 16bpp, (msb)1A 5B 5G 5R(lsb), in CPU endianness, most significant bit to 1
+    PIX_FMT_BGR8,      ///< packed RGB 3:3:2,  8bpp, (msb)2B 3G 3R(lsb)
+    PIX_FMT_BGR4,      ///< packed RGB 1:2:1,  4bpp, (msb)1B 2G 1R(lsb)
+    PIX_FMT_BGR4_BYTE, ///< packed RGB 1:2:1,  8bpp, (msb)1B 2G 1R(lsb)
+    PIX_FMT_RGB8,      ///< packed RGB 3:3:2,  8bpp, (msb)2R 3G 3B(lsb)
+    PIX_FMT_RGB4,      ///< packed RGB 1:2:1,  4bpp, (msb)1R 2G 1B(lsb)
+    PIX_FMT_RGB4_BYTE, ///< packed RGB 1:2:1,  8bpp, (msb)1R 2G 1B(lsb)
+    PIX_FMT_NV12,      ///< planar YUV 4:2:0, 12bpp, 1 plane for Y and 1 for UV
     PIX_FMT_NV21,      ///< as above, but U and V bytes are swapped
 
-    PIX_FMT_RGB32_1,   ///< Packed RGB 8:8:8, 32bpp, (msb)8R 8G 8B 8A(lsb), in cpu endianness
-    PIX_FMT_BGR32_1,   ///< Packed RGB 8:8:8, 32bpp, (msb)8B 8G 8R 8A(lsb), in cpu endianness
+    PIX_FMT_RGB32_1,   ///< packed RGB 8:8:8, 32bpp, (msb)8R 8G 8B 8A(lsb), in CPU endianness
+    PIX_FMT_BGR32_1,   ///< packed RGB 8:8:8, 32bpp, (msb)8B 8G 8R 8A(lsb), in CPU endianness
 
     PIX_FMT_GRAY16BE,  ///<        Y        , 16bpp, big-endian
     PIX_FMT_GRAY16LE,  ///<        Y        , 16bpp, little-endian
-    PIX_FMT_YUV440P,   ///< Planar YUV 4:4:0 (1 Cr & Cb sample per 1x2 Y samples)
-    PIX_FMT_YUVJ440P,  ///< Planar YUV 4:4:0 full scale (jpeg)
-    PIX_FMT_YUVA420P,  ///< Planar YUV 4:2:0, 20bpp, (1 Cr & Cb sample per 2x2 Y & A samples)
+    PIX_FMT_YUV440P,   ///< planar YUV 4:4:0 (1 Cr & Cb sample per 1x2 Y samples)
+    PIX_FMT_YUVJ440P,  ///< planar YUV 4:4:0 full scale (JPEG)
+    PIX_FMT_YUVA420P,  ///< planar YUV 4:2:0, 20bpp, (1 Cr & Cb sample per 2x2 Y & A samples)
+    PIX_FMT_VDPAU_H264,///< H.264 HW decoding with VDPAU, data[0] contains a vdpau_render_state struct which contains the bitstream of the slices as well as various fields extracted from headers
+    PIX_FMT_VDPAU_MPEG1,///< MPEG-1 HW decoding with VDPAU, data[0] contains a vdpau_render_state struct which contains the bitstream of the slices as well as various fields extracted from headers
+    PIX_FMT_VDPAU_MPEG2,///< MPEG-2 HW decoding with VDPAU, data[0] contains a vdpau_render_state struct which contains the bitstream of the slices as well as various fields extracted from headers
+    PIX_FMT_VDPAU_WMV3,///< WMV3 HW decoding with VDPAU, data[0] contains a vdpau_render_state struct which contains the bitstream of the slices as well as various fields extracted from headers
+    PIX_FMT_VDPAU_VC1, ///< VC-1 HW decoding with VDPAU, data[0] contains a vdpau_render_state struct which contains the bitstream of the slices as well as various fields extracted from headers
     PIX_FMT_NB         ///< number of pixel formats, DO NOT USE THIS if you want to link with shared libav* because the number of formats might differ between versions
   );
 
@@ -185,7 +190,7 @@ const
 
 (* common.h *)
 
-function MKTAG(a,b,c,d: char): integer;
+function MKTAG(a,b,c,d: AnsiChar): integer;
 
 (* mem.h *)
 
@@ -244,7 +249,7 @@ function av_mallocz(size: cuint): pointer;
  * @return Pointer to a newly allocated string containing a
  * copy of \p s or NULL if it cannot be allocated.
  *)
-function av_strdup({const} s: PChar): PChar;
+function av_strdup({const} s: PAnsiChar): PAnsiChar;
   cdecl; external av__util; {av_malloc_attrib}
 
 (**
@@ -312,7 +317,7 @@ procedure av_log_set_level(level: cint);
 
 implementation
 
-function MKTAG(a,b,c,d: char): integer;
+function MKTAG(a,b,c,d: AnsiChar): integer;
 begin
   Result := (ord(a) or (ord(b) shl 8) or (ord(c) shl 16) or (ord(d) shl 24));
 end;
-- 
cgit v1.2.3


From d5c37124567bb67fcef16348dc7ad67c4aff9e59 Mon Sep 17 00:00:00 2001
From: k-m_schindler <k-m_schindler@b956fd51-792f-4845-bead-9b4dfca2ff2c>
Date: Wed, 10 Jun 2009 11:04:33 +0000
Subject: part 1 of ffmpeg update. several are still missing

git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@1807 b956fd51-792f-4845-bead-9b4dfca2ff2c
---
 src/lib/ffmpeg/avutil.pas | 183 +++++++++++++++++++++++++++++++++-------------
 1 file changed, 132 insertions(+), 51 deletions(-)

(limited to 'src/lib/ffmpeg/avutil.pas')

diff --git a/src/lib/ffmpeg/avutil.pas b/src/lib/ffmpeg/avutil.pas
index 6de35f1b..bba5b34a 100644
--- a/src/lib/ffmpeg/avutil.pas
+++ b/src/lib/ffmpeg/avutil.pas
@@ -29,14 +29,21 @@
  *
  * libavutil/avutil.h:
  *  Min. version: 49.0.1, revision 6577,  Sat Oct 7 15:30:46 2006 UTC
- *  Max. version: 49.14.0, revision 16912, Sun Feb 1 02:00:19 2009 UTC 
+ *  Max. version: 49.14.0, revision 16912, Sun Feb 1 02:00:19 2009 UTC
  *
  * libavutil/mem.h:
- *  revision 16590, Tue Jan 13 23:44:16 2009 UTC 
+ *  revision 16590, Tue Jan 13 23:44:16 2009 UTC
  *
  * libavutil/log.h:
- *  revision 16571, Tue Jan 13 00:14:43 2009 UTC 
+ *  revision 16571, Tue Jan 13 00:14:43 2009 UTC
  *)
+{
+ Update changes auf avutil.h, mem.h and log.h
+ Max. version 50.03.0, Tue, Jun 09 24:00:00 2009 UTC 
+ include/keep pixfmt.h (change in revision 50.01.0)
+ Maybe, the pixelformats are not needed, but it has not been checked.
+ log.h is only partial.
+}
 
 unit avutil;
 
@@ -62,8 +69,8 @@ uses
 
 const
   (* Max. supported version by this header *)
-  LIBAVUTIL_MAX_VERSION_MAJOR   = 49;
-  LIBAVUTIL_MAX_VERSION_MINOR   = 14;
+  LIBAVUTIL_MAX_VERSION_MAJOR   = 50;
+  LIBAVUTIL_MAX_VERSION_MINOR   = 3;
   LIBAVUTIL_MAX_VERSION_RELEASE = 0;
   LIBAVUTIL_MAX_VERSION = (LIBAVUTIL_MAX_VERSION_MAJOR * VERSION_MAJOR) +
                           (LIBAVUTIL_MAX_VERSION_MINOR * VERSION_MINOR) +
@@ -112,6 +119,14 @@ type
  * components stored in AVFrame.data[1] should be in the range 0..255.
  * This is important as many custom PAL8 video codecs that were designed
  * to run on the IBM VGA graphics adapter use 6-bit palette components.
+ *
+ * For all the 8bit per pixel formats, an RGB32 palette is in data[1] like
+ * for pal8. This palette is filled in automatically by the function
+ * allocating the picture.
+ *
+ * Note, make sure that all newly added big endian formats have pix_fmt&1==1
+ * and that all newly added little endian formats have pix_fmt&1==0
+ * this allows simpler detection of big vs little endian.
  *)
 
   PAVPixelFormat = ^TAVPixelFormat;
@@ -123,11 +138,15 @@ type
     PIX_FMT_BGR24,     ///< packed RGB 8:8:8, 24bpp, BGRBGR...
     PIX_FMT_YUV422P,   ///< planar YUV 4:2:2, 16bpp, (1 Cr & Cb sample per 2x1 Y samples)
     PIX_FMT_YUV444P,   ///< planar YUV 4:4:4, 24bpp, (1 Cr & Cb sample per 1x1 Y samples)
+{$IF LIBAVUTIL_VERSION <= 50001000} // 50.01.0
     PIX_FMT_RGB32,     ///< packed RGB 8:8:8, 32bpp, (msb)8A 8R 8G 8B(lsb), in CPU endianness
+{$IFEND}
     PIX_FMT_YUV410P,   ///< planar YUV 4:1:0,  9bpp, (1 Cr & Cb sample per 4x4 Y samples)
     PIX_FMT_YUV411P,   ///< planar YUV 4:1:1, 12bpp, (1 Cr & Cb sample per 4x1 Y samples)
+{$IF LIBAVUTIL_VERSION <= 50000000} // 50.00.0
     PIX_FMT_RGB565,    ///< packed RGB 5:6:5, 16bpp, (msb)   5R 6G 5B(lsb), in CPU endianness
     PIX_FMT_RGB555,    ///< packed RGB 5:5:5, 16bpp, (msb)1A 5R 5G 5B(lsb), in CPU endianness, most significant bit to 0
+{$IFEND}
     PIX_FMT_GRAY8,     ///<        Y        ,  8bpp
     PIX_FMT_MONOWHITE, ///<        Y        ,  1bpp, 0 is white, 1 is black
     PIX_FMT_MONOBLACK, ///<        Y        ,  1bpp, 0 is black, 1 is white
@@ -135,13 +154,17 @@ type
     PIX_FMT_YUVJ420P,  ///< planar YUV 4:2:0, 12bpp, full scale (JPEG)
     PIX_FMT_YUVJ422P,  ///< planar YUV 4:2:2, 16bpp, full scale (JPEG)
     PIX_FMT_YUVJ444P,  ///< planar YUV 4:4:4, 24bpp, full scale (JPEG)
-    PIX_FMT_XVMC_MPEG2_MC,///< XVideo Motion Acceleration via common packet passing(xvmc_render.h)
+    PIX_FMT_XVMC_MPEG2_MC,///< XVideo Motion Acceleration via common packet passing
     PIX_FMT_XVMC_MPEG2_IDCT,
     PIX_FMT_UYVY422,   ///< packed YUV 4:2:2, 16bpp, Cb Y0 Cr Y1
     PIX_FMT_UYYVYY411, ///< packed YUV 4:1:1, 12bpp, Cb Y0 Y1 Cr Y2 Y3
+{$IF LIBAVUTIL_VERSION <= 50001000} // 50.01.0
     PIX_FMT_BGR32,     ///< packed RGB 8:8:8, 32bpp, (msb)8A 8B 8G 8R(lsb), in CPU endianness
+{$IFEND}
+{$IF LIBAVUTIL_VERSION <= 50000000} // 50.00.0
     PIX_FMT_BGR565,    ///< packed RGB 5:6:5, 16bpp, (msb)   5B 6G 5R(lsb), in CPU endianness
     PIX_FMT_BGR555,    ///< packed RGB 5:5:5, 16bpp, (msb)1A 5B 5G 5R(lsb), in CPU endianness, most significant bit to 1
+{$IFEND}
     PIX_FMT_BGR8,      ///< packed RGB 3:3:2,  8bpp, (msb)2B 3G 3R(lsb)
     PIX_FMT_BGR4,      ///< packed RGB 1:2:1,  4bpp, (msb)1B 2G 1R(lsb)
     PIX_FMT_BGR4_BYTE, ///< packed RGB 1:2:1,  8bpp, (msb)1B 2G 1R(lsb)
@@ -150,10 +173,15 @@ type
     PIX_FMT_RGB4_BYTE, ///< packed RGB 1:2:1,  8bpp, (msb)1R 2G 1B(lsb)
     PIX_FMT_NV12,      ///< planar YUV 4:2:0, 12bpp, 1 plane for Y and 1 for UV
     PIX_FMT_NV21,      ///< as above, but U and V bytes are swapped
-
+{$IF LIBAVUTIL_VERSION <= 50001000} // 50.01.0
     PIX_FMT_RGB32_1,   ///< packed RGB 8:8:8, 32bpp, (msb)8R 8G 8B 8A(lsb), in CPU endianness
     PIX_FMT_BGR32_1,   ///< packed RGB 8:8:8, 32bpp, (msb)8B 8G 8R 8A(lsb), in CPU endianness
-
+{$ELSE} // 50.02.0
+    PIX_FMT_ARGB,      ///< packed ARGB 8:8:8:8, 32bpp, ARGBARGB...
+    PIX_FMT_RGBA,      ///< packed RGBA 8:8:8:8, 32bpp, RGBARGBA...
+    PIX_FMT_ABGR,      ///< packed ABGR 8:8:8:8, 32bpp, ABGRABGR...
+    PIX_FMT_BGRA,      ///< packed BGRA 8:8:8:8, 32bpp, BGRABGRA...
+{$IFEND}
     PIX_FMT_GRAY16BE,  ///<        Y        , 16bpp, big-endian
     PIX_FMT_GRAY16LE,  ///<        Y        , 16bpp, little-endian
     PIX_FMT_YUV440P,   ///< planar YUV 4:4:0 (1 Cr & Cb sample per 1x2 Y samples)
@@ -164,23 +192,74 @@ type
     PIX_FMT_VDPAU_MPEG2,///< MPEG-2 HW decoding with VDPAU, data[0] contains a vdpau_render_state struct which contains the bitstream of the slices as well as various fields extracted from headers
     PIX_FMT_VDPAU_WMV3,///< WMV3 HW decoding with VDPAU, data[0] contains a vdpau_render_state struct which contains the bitstream of the slices as well as various fields extracted from headers
     PIX_FMT_VDPAU_VC1, ///< VC-1 HW decoding with VDPAU, data[0] contains a vdpau_render_state struct which contains the bitstream of the slices as well as various fields extracted from headers
+{$IF LIBAVUTIL_VERSION >= 49015000} // 49.15.0
+    PIX_FMT_RGB48BE,   ///< packed RGB 16:16:16, 48bpp, 16R, 16G, 16B, big-endian
+    PIX_FMT_RGB48LE,   ///< packed RGB 16:16:16, 48bpp, 16R, 16G, 16B, little-endian
+{$IFEND}
+{$IF LIBAVUTIL_VERSION >= 50001000} // 50.01.0
+    PIX_FMT_RGB565BE,  ///< packed RGB 5:6:5, 16bpp, (msb)   5R 6G 5B(lsb), big-endian
+    PIX_FMT_RGB565LE,  ///< packed RGB 5:6:5, 16bpp, (msb)   5R 6G 5B(lsb), little-endian
+    PIX_FMT_RGB555BE,  ///< packed RGB 5:5:5, 16bpp, (msb)1A 5R 5G 5B(lsb), big-endian, most significant bit to 0
+    PIX_FMT_RGB555LE,  ///< packed RGB 5:5:5, 16bpp, (msb)1A 5R 5G 5B(lsb), little-endian, most significant bit to 0
+
+    PIX_FMT_BGR565BE,  ///< packed BGR 5:6:5, 16bpp, (msb)   5B 6G 5R(lsb), big-endian
+    PIX_FMT_BGR565LE,  ///< packed BGR 5:6:5, 16bpp, (msb)   5B 6G 5R(lsb), little-endian
+    PIX_FMT_BGR555BE,  ///< packed BGR 5:5:5, 16bpp, (msb)1A 5B 5G 5R(lsb), big-endian, most significant bit to 1
+    PIX_FMT_BGR555LE,  ///< packed BGR 5:5:5, 16bpp, (msb)1A 5B 5G 5R(lsb), little-endian, most significant bit to 1
+
+    PIX_FMT_VAAPI_MOCO, ///< HW acceleration through VA API at motion compensation entry-point, Picture.data[3] contains a vaapi_render_state struct which contains macroblocks as well as various fields extracted from headers
+    PIX_FMT_VAAPI_IDCT, ///< HW acceleration through VA API at IDCT entry-point, Picture.data[3] contains a vaapi_render_state struct which contains fields extracted from headers
+    PIX_FMT_VAAPI_VLD,  ///< HW decoding through VA API, Picture.data[3] contains a vaapi_render_state struct which contains the bitstream of the slices as well as various fields extracted from headers
+{$IFEND}
     PIX_FMT_NB         ///< number of pixel formats, DO NOT USE THIS if you want to link with shared libav* because the number of formats might differ between versions
   );
 
 const
 {$ifdef WORDS_BIGENDIAN}
-  PIX_FMT_RGBA = PIX_FMT_RGB32_1;
-  PIX_FMT_BGRA = PIX_FMT_BGR32_1;
-  PIX_FMT_ARGB = PIX_FMT_RGB32;
-  PIX_FMT_ABGR = PIX_FMT_BGR32;
-  PIX_FMT_GRAY16 = PIX_FMT_GRAY16BE;
+  {$IF LIBAVUTIL_VERSION <= 50001000} // 50.01.0
+    PIX_FMT_RGBA    = PIX_FMT_RGB32_1;
+    PIX_FMT_BGRA    = PIX_FMT_BGR32_1;
+    PIX_FMT_ARGB    = PIX_FMT_RGB32;
+    PIX_FMT_ABGR    = PIX_FMT_BGR32;
+  {$ELSE} // 50.02.0
+    PIX_FMT_RGB32   = PIX_FMT_ARGB;
+    PIX_FMT_RGB32_1 = PIX_FMT_RGBA;
+    PIX_FMT_BGR32   = PIX_FMT_ABGR;
+    PIX_FMT_BGR32_1 = PIX_FMT_BGRA;
+  {$IFEND}
+  PIX_FMT_GRAY16  = PIX_FMT_GRAY16BE;
+  {$IF LIBAVUTIL_VERSION >= 49015000} // 49.15.0
+    PIX_FMT_RGB48   = PIX_FMT_RGB48BE;
+  {$IFEND}
+  {$IF LIBAVUTIL_VERSION >= 50001000} // 50.01.0
+    PIX_FMT_RGB565  = PIX_FMT_RGB565BE;
+    PIX_FMT_RGB555  = PIX_FMT_RGB555BE;
+    PIX_FMT_BGR565  = PIX_FMT_BGR565BE;
+    PIX_FMT_BGR555  = PIX_FMT_BGR555BE
+  {$IFEND}
 {$else}
-  PIX_FMT_RGBA = PIX_FMT_BGR32;
-  PIX_FMT_BGRA = PIX_FMT_RGB32;
-  PIX_FMT_ARGB = PIX_FMT_BGR32_1;
-  PIX_FMT_ABGR = PIX_FMT_RGB32_1;
-  PIX_FMT_GRAY16 = PIX_FMT_GRAY16LE;
-{$endif}
+  {$IF LIBAVUTIL_VERSION <= 50001000} // 50.01.0
+    PIX_FMT_RGBA    = PIX_FMT_BGR32;
+    PIX_FMT_BGRA    = PIX_FMT_RGB32;
+    PIX_FMT_ARGB    = PIX_FMT_BGR32_1;
+    PIX_FMT_ABGR    = PIX_FMT_RGB32_1;
+  {$ELSE} // 50.02.0
+    PIX_FMT_RGB32   = PIX_FMT_BGRA;
+    PIX_FMT_RGB32_1 = PIX_FMT_ABGR;
+    PIX_FMT_BGR32   = PIX_FMT_RGBA;
+    PIX_FMT_BGR32_1 = PIX_FMT_ARGB;
+  {$IFEND}
+  PIX_FMT_GRAY16  = PIX_FMT_GRAY16LE;
+  {$IF LIBAVUTIL_VERSION >= 49015000} // 49.15.0
+    PIX_FMT_RGB48   = PIX_FMT_RGB48LE;
+  {$IFEND}
+  {$IF LIBAVUTIL_VERSION >= 50001000} // 50.01.0
+    PIX_FMT_RGB565  = PIX_FMT_RGB565LE;
+    PIX_FMT_RGB555  = PIX_FMT_RGB555LE;
+    PIX_FMT_BGR565  = PIX_FMT_BGR565LE;
+    PIX_FMT_BGR555  = PIX_FMT_BGR555LE;
+  {$ENDIF}
+{$ENDIF}
 
 {$IF LIBAVUTIL_VERSION_MAJOR < 50} // 50.0.0
   PIX_FMT_UYVY411 = PIX_FMT_UYYVYY411;
@@ -188,40 +267,41 @@ const
   PIX_FMT_YUV422  = PIX_FMT_YUYV422;
 {$IFEND}
 
-(* common.h *)
+(* libavutil/common.h *) // until now MKTAG is all from common.h KMS 9/6/2009
 
-function MKTAG(a,b,c,d: AnsiChar): integer;
+function MKTAG(a, b, c, d: AnsiChar): integer;
 
-(* mem.h *)
+(* libavutil/mem.h *)
+(* memory handling functions *)
 
 (**
- * Allocate a block of \p size bytes with alignment suitable for all
+ * Allocates a block of size bytes with alignment suitable for all
  * memory accesses (including vectors if available on the CPU).
  * @param size Size in bytes for the memory block to be allocated.
- * @return Pointer to the allocated block, NULL if it cannot allocate
- * it.
+ * @return Pointer to the allocated block, NULL if the block cannot
+ * be allocated.
  * @see av_mallocz()
  *)
 function av_malloc(size: cuint): pointer;
   cdecl; external av__util; {av_malloc_attrib av_alloc_size(1)}
 
 (**
- * Allocate or reallocate a block of memory.
- * If \p ptr is NULL and \p size > 0, allocate a new block. If \p
- * size is zero, free the memory block pointed by \p ptr.
+ * Allocates or reallocates a block of memory.
+ * If ptr is NULL and size > 0, allocates a new block. If \p
+ * size is zero, frees the memory block pointed to by ptr.
  * @param size Size in bytes for the memory block to be allocated or
  * reallocated.
  * @param ptr Pointer to a memory block already allocated with
  * av_malloc(z)() or av_realloc() or NULL.
- * @return Pointer to a newly reallocated block or NULL if it cannot
- * reallocate or the function is used to free the memory block.
+ * @return Pointer to a newly reallocated block or NULL if the block
+ * cannot be allocated or the function is used to free the memory block.
  * @see av_fast_realloc()
  *)
 function av_realloc(ptr: pointer; size: cuint): pointer;
   cdecl; external av__util; {av_alloc_size(2)}
 
 (**
- * Free a memory block which has been allocated with av_malloc(z)() or
+ * Frees a memory block which has been allocated with av_malloc(z)() or
  * av_realloc().
  * @param ptr Pointer to the memory block which should be freed.
  * @note ptr = NULL is explicitly allowed.
@@ -232,29 +312,28 @@ procedure av_free(ptr: pointer);
   cdecl; external av__util;
 
 (**
- * Allocate a block of \p size bytes with alignment suitable for all
+ * Allocates a block of size bytes with alignment suitable for all
  * memory accesses (including vectors if available on the CPU) and
- * set to zeroes all the bytes of the block.
+ * zeroes all the bytes of the block.
  * @param size Size in bytes for the memory block to be allocated.
- * @return Pointer to the allocated block, NULL if it cannot allocate
- * it.
+ * @return Pointer to the allocated block, NULL if it cannot be allocated.
  * @see av_malloc()
  *)
 function av_mallocz(size: cuint): pointer;
   cdecl; external av__util; {av_malloc_attrib av_alloc_size(1)}
 
 (**
- * Duplicate the string \p s.
- * @param s String to be duplicated.
+ * Duplicates the string s.
+ * @param s string to be duplicated.
  * @return Pointer to a newly allocated string containing a
- * copy of \p s or NULL if it cannot be allocated.
+ * copy of \p s or NULL if the string cannot be allocated.
  *)
 function av_strdup({const} s: PAnsiChar): PAnsiChar;
   cdecl; external av__util; {av_malloc_attrib}
 
 (**
- * Free a memory block which has been allocated with av_malloc(z)() or
- * av_realloc() and set to NULL the pointer to it.
+ * Frees a memory block which has been allocated with av_malloc(z)() or
+ * av_realloc() and set the pointer pointing to it to NULL.
  * @param ptr Pointer to the pointer to the memory block which should
  * be freed.
  * @see av_free()
@@ -262,7 +341,7 @@ function av_strdup({const} s: PAnsiChar): PAnsiChar;
 procedure av_freep (ptr: pointer);
   cdecl; external av__util;
 
-(* log.h *)
+(* libavutil/log.h *)
 
 const
 {$IF LIBAVUTIL_VERSION_MAJOR < 50}
@@ -277,26 +356,26 @@ const
   AV_LOG_QUIET   = -8;
 
 (**
- * something went really wrong and we will crash now
+ * Something went really wrong and we will crash now.
  *)
   AV_LOG_PANIC   =  0;
 
 (**
- * something went wrong and recovery is not possible
- * like no header in a format which depends on it or a combination
- * of parameters which are not allowed
+ * Something went wrong and recovery is not possible.
+ * For example, no header was found for a format which depends
+ * on headers or an illegal combination of parameters is used.
  *)
   AV_LOG_FATAL   =  8;
 
 (**
- * something went wrong and cannot losslessly be recovered
- * but not all future data is affected
+ * Something went wrong and cannot losslessly be recovered.
+ * However, not all future data is affected.
  *)
   AV_LOG_ERROR   = 16;
 
 (**
- * something somehow does not look correct / something which may or may not
- * lead to some problems like use of -vstrict -2
+ * Something somehow does not look correct. This may or may not
+ * lead to problems. An example would be the use of '-vstrict -2'.
  *)
   AV_LOG_WARNING = 24;
 
@@ -304,7 +383,7 @@ const
   AV_LOG_VERBOSE = 40;
 
 (**
- * stuff which is only useful for libav* developers
+ * Stuff which is only useful for libav* developers.
  *)
   AV_LOG_DEBUG   = 48;
 {$IFEND}
@@ -317,7 +396,9 @@ procedure av_log_set_level(level: cint);
 
 implementation
 
-function MKTAG(a,b,c,d: AnsiChar): integer;
+(* libavutil/common.h *)
+
+function MKTAG(a, b, c, d: AnsiChar): integer;
 begin
   Result := (ord(a) or (ord(b) shl 8) or (ord(c) shl 16) or (ord(d) shl 24));
 end;
-- 
cgit v1.2.3


From 854505479655087cd88f29e7b5cce1e748c6076c Mon Sep 17 00:00:00 2001
From: whiteshark0 <whiteshark0@b956fd51-792f-4845-bead-9b4dfca2ff2c>
Date: Fri, 12 Jun 2009 17:58:23 +0000
Subject: fix compile w/ delphi 7

git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@1810 b956fd51-792f-4845-bead-9b4dfca2ff2c
---
 src/lib/ffmpeg/avutil.pas | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/lib/ffmpeg/avutil.pas')

diff --git a/src/lib/ffmpeg/avutil.pas b/src/lib/ffmpeg/avutil.pas
index bba5b34a..6a93ea12 100644
--- a/src/lib/ffmpeg/avutil.pas
+++ b/src/lib/ffmpeg/avutil.pas
@@ -258,7 +258,7 @@ const
     PIX_FMT_RGB555  = PIX_FMT_RGB555LE;
     PIX_FMT_BGR565  = PIX_FMT_BGR565LE;
     PIX_FMT_BGR555  = PIX_FMT_BGR555LE;
-  {$ENDIF}
+  {$IFEND}
 {$ENDIF}
 
 {$IF LIBAVUTIL_VERSION_MAJOR < 50} // 50.0.0
-- 
cgit v1.2.3


From cfde3dc5b61b36107d79279d028d096f4cd4ca3e Mon Sep 17 00:00:00 2001
From: k-m_schindler <k-m_schindler@b956fd51-792f-4845-bead-9b4dfca2ff2c>
Date: Sun, 6 Dec 2009 19:32:45 +0000
Subject: update to version 50.4.0.

git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@1994 b956fd51-792f-4845-bead-9b4dfca2ff2c
---
 src/lib/ffmpeg/avutil.pas | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

(limited to 'src/lib/ffmpeg/avutil.pas')

diff --git a/src/lib/ffmpeg/avutil.pas b/src/lib/ffmpeg/avutil.pas
index 6a93ea12..53006453 100644
--- a/src/lib/ffmpeg/avutil.pas
+++ b/src/lib/ffmpeg/avutil.pas
@@ -70,7 +70,7 @@ uses
 const
   (* Max. supported version by this header *)
   LIBAVUTIL_MAX_VERSION_MAJOR   = 50;
-  LIBAVUTIL_MAX_VERSION_MINOR   = 3;
+  LIBAVUTIL_MAX_VERSION_MINOR   = 4;
   LIBAVUTIL_MAX_VERSION_RELEASE = 0;
   LIBAVUTIL_MAX_VERSION = (LIBAVUTIL_MAX_VERSION_MAJOR * VERSION_MAJOR) +
                           (LIBAVUTIL_MAX_VERSION_MINOR * VERSION_MINOR) +
@@ -101,6 +101,20 @@ function avutil_version(): cuint;
   cdecl; external av__format;
 {$IFEND}
 
+{$IF LIBAVUTIL_VERSION >= 50004000} // >= 50.4.0
+(**
+ * Returns the libavutil build-time configuration.
+ *)
+function avutil_configuration(): PAnsiChar;
+  cdecl; external av__format;
+
+(**
+ * Returns the libavutil license.
+ *)
+function avutil_license(): PAnsiChar;
+  cdecl; external av__format;
+{$IFEND}
+
 type
 (**
  * Pixel format. Notes:
-- 
cgit v1.2.3


From bbfe17a20545568ebef4cc1e7641f3859f743f9d Mon Sep 17 00:00:00 2001
From: k-m_schindler <k-m_schindler@b956fd51-792f-4845-bead-9b4dfca2ff2c>
Date: Sun, 6 Dec 2009 19:42:04 +0000
Subject: update to version 50.5.1.

git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@1995 b956fd51-792f-4845-bead-9b4dfca2ff2c
---
 src/lib/ffmpeg/avutil.pas | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'src/lib/ffmpeg/avutil.pas')

diff --git a/src/lib/ffmpeg/avutil.pas b/src/lib/ffmpeg/avutil.pas
index 53006453..55bab601 100644
--- a/src/lib/ffmpeg/avutil.pas
+++ b/src/lib/ffmpeg/avutil.pas
@@ -39,7 +39,7 @@
  *)
 {
  Update changes auf avutil.h, mem.h and log.h
- Max. version 50.03.0, Tue, Jun 09 24:00:00 2009 UTC 
+ Max. version 50.05.1, Sun, Dec 6 24:00:00 2009 UTC 
  include/keep pixfmt.h (change in revision 50.01.0)
  Maybe, the pixelformats are not needed, but it has not been checked.
  log.h is only partial.
@@ -70,8 +70,8 @@ uses
 const
   (* Max. supported version by this header *)
   LIBAVUTIL_MAX_VERSION_MAJOR   = 50;
-  LIBAVUTIL_MAX_VERSION_MINOR   = 4;
-  LIBAVUTIL_MAX_VERSION_RELEASE = 0;
+  LIBAVUTIL_MAX_VERSION_MINOR   = 5;
+  LIBAVUTIL_MAX_VERSION_RELEASE = 1;
   LIBAVUTIL_MAX_VERSION = (LIBAVUTIL_MAX_VERSION_MAJOR * VERSION_MAJOR) +
                           (LIBAVUTIL_MAX_VERSION_MINOR * VERSION_MINOR) +
                           (LIBAVUTIL_MAX_VERSION_RELEASE * VERSION_RELEASE);
@@ -301,7 +301,7 @@ function av_malloc(size: cuint): pointer;
 
 (**
  * Allocates or reallocates a block of memory.
- * If ptr is NULL and size > 0, allocates a new block. If \p
+ * If ptr is NULL and size > 0, allocates a new block. If 
  * size is zero, frees the memory block pointed to by ptr.
  * @param size Size in bytes for the memory block to be allocated or
  * reallocated.
@@ -340,7 +340,7 @@ function av_mallocz(size: cuint): pointer;
  * Duplicates the string s.
  * @param s string to be duplicated.
  * @return Pointer to a newly allocated string containing a
- * copy of \p s or NULL if the string cannot be allocated.
+ * copy of s or NULL if the string cannot be allocated.
  *)
 function av_strdup({const} s: PAnsiChar): PAnsiChar;
   cdecl; external av__util; {av_malloc_attrib}
-- 
cgit v1.2.3


From e22d981dcb8f0014ce28fdc07b59248d87376fad Mon Sep 17 00:00:00 2001
From: k-m_schindler <k-m_schindler@b956fd51-792f-4845-bead-9b4dfca2ff2c>
Date: Mon, 28 Dec 2009 23:54:22 +0000
Subject: update of the headers.

git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@2054 b956fd51-792f-4845-bead-9b4dfca2ff2c
---
 src/lib/ffmpeg/avutil.pas | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'src/lib/ffmpeg/avutil.pas')

diff --git a/src/lib/ffmpeg/avutil.pas b/src/lib/ffmpeg/avutil.pas
index 55bab601..c0428bef 100644
--- a/src/lib/ffmpeg/avutil.pas
+++ b/src/lib/ffmpeg/avutil.pas
@@ -39,7 +39,7 @@
  *)
 {
  Update changes auf avutil.h, mem.h and log.h
- Max. version 50.05.1, Sun, Dec 6 24:00:00 2009 UTC 
+ Max. version 50.7.0, Tue, Dec 29 0:30:00 2009 UTC 
  include/keep pixfmt.h (change in revision 50.01.0)
  Maybe, the pixelformats are not needed, but it has not been checked.
  log.h is only partial.
@@ -70,8 +70,8 @@ uses
 const
   (* Max. supported version by this header *)
   LIBAVUTIL_MAX_VERSION_MAJOR   = 50;
-  LIBAVUTIL_MAX_VERSION_MINOR   = 5;
-  LIBAVUTIL_MAX_VERSION_RELEASE = 1;
+  LIBAVUTIL_MAX_VERSION_MINOR   = 7;
+  LIBAVUTIL_MAX_VERSION_RELEASE = 0;
   LIBAVUTIL_MAX_VERSION = (LIBAVUTIL_MAX_VERSION_MAJOR * VERSION_MAJOR) +
                           (LIBAVUTIL_MAX_VERSION_MINOR * VERSION_MINOR) +
                           (LIBAVUTIL_MAX_VERSION_RELEASE * VERSION_RELEASE);
-- 
cgit v1.2.3


From d35aae71ead05b26b5e00b25de4f6ed11f11ad13 Mon Sep 17 00:00:00 2001
From: k-m_schindler <k-m_schindler@b956fd51-792f-4845-bead-9b4dfca2ff2c>
Date: Mon, 4 Jan 2010 23:51:10 +0000
Subject: correction of some misplaced fields + some editorial changes + update
 to current

git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@2067 b956fd51-792f-4845-bead-9b4dfca2ff2c
---
 src/lib/ffmpeg/avutil.pas | 47 ++++++++++++++++++++++++++++++++++++++++-------
 1 file changed, 40 insertions(+), 7 deletions(-)

(limited to 'src/lib/ffmpeg/avutil.pas')

diff --git a/src/lib/ffmpeg/avutil.pas b/src/lib/ffmpeg/avutil.pas
index c0428bef..a5e6b889 100644
--- a/src/lib/ffmpeg/avutil.pas
+++ b/src/lib/ffmpeg/avutil.pas
@@ -36,14 +36,15 @@
  *
  * libavutil/log.h:
  *  revision 16571, Tue Jan 13 00:14:43 2009 UTC
+ *
+ * Update changes auf avutil.h, mem.h and log.h
+ * Max. version 50.7.0, Tue, Dec 29 0:30:00 2009 UTC 
+ * include/keep pixfmt.h (change in revision 50.01.0)
+ * Maybe, the pixelformats are not needed, but it has not been checked.
+ * log.h is only partial.
+ *
+ * update Mon, Jan 4 2010
  *)
-{
- Update changes auf avutil.h, mem.h and log.h
- Max. version 50.7.0, Tue, Dec 29 0:30:00 2009 UTC 
- include/keep pixfmt.h (change in revision 50.01.0)
- Maybe, the pixelformats are not needed, but it has not been checked.
- log.h is only partial.
-}
 
 unit avutil;
 
@@ -115,6 +116,8 @@ function avutil_license(): PAnsiChar;
   cdecl; external av__format;
 {$IFEND}
 
+(* libavutil/pixfmt.h *)
+
 type
 (**
  * Pixel format. Notes:
@@ -286,6 +289,7 @@ const
 function MKTAG(a, b, c, d: AnsiChar): integer;
 
 (* libavutil/mem.h *)
+
 (* memory handling functions *)
 
 (**
@@ -402,11 +406,40 @@ const
   AV_LOG_DEBUG   = 48;
 {$IFEND}
 
+(**
+ * Sends the specified message to the log if the level is less than or equal
+ * to the current av_log_level. By default, all logging messages are sent to
+ * stderr. This behavior can be altered by setting a different av_vlog callback
+ * function.
+ *
+ * @param avcl A pointer to an arbitrary struct of which the first field is a
+ * pointer to an AVClass struct.
+ * @param level The importance level of the message, lower values signifying
+ * higher importance.
+ * @param fmt The format string (printf-compatible) that specifies how
+ * subsequent arguments are converted to output.
+ * @see av_vlog
+ *)
+
+{** to be translated if needed
+#ifdef __GNUC__
+void av_log(void*, int level, const char *fmt, ...) __attribute__ ((__format__ (__printf__, 3, 4)));
+#else
+void av_log(void*, int level, const char *fmt, ...);
+#endif
+ 
+void av_vlog(void*, int level, const char *fmt, va_list);
+**}
+
 function av_log_get_level(): cint;
   cdecl; external av__util;
 procedure av_log_set_level(level: cint);
   cdecl; external av__util;
 
+{** to be translated if needed
+void av_log_set_callback(void (*)(void*, int, const char*, va_list));
+void av_log_default_callback(void* ptr, int level, const char* fmt, va_list vl);
+**}
 
 implementation
 
-- 
cgit v1.2.3


From f068d9e1cbcc6e316bd672de55bca6a818744670 Mon Sep 17 00:00:00 2001
From: k-m_schindler <k-m_schindler@b956fd51-792f-4845-bead-9b4dfca2ff2c>
Date: Sat, 20 Feb 2010 23:12:02 +0000
Subject: update of avutil.pas to 50.9.0

git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@2121 b956fd51-792f-4845-bead-9b4dfca2ff2c
---
 src/lib/ffmpeg/avutil.pas | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/lib/ffmpeg/avutil.pas')

diff --git a/src/lib/ffmpeg/avutil.pas b/src/lib/ffmpeg/avutil.pas
index a5e6b889..0cf5f120 100644
--- a/src/lib/ffmpeg/avutil.pas
+++ b/src/lib/ffmpeg/avutil.pas
@@ -43,7 +43,7 @@
  * Maybe, the pixelformats are not needed, but it has not been checked.
  * log.h is only partial.
  *
- * update Mon, Jan 4 2010
+ * update Sun to 50.9.0, Feb 21, 2010
  *)
 
 unit avutil;
@@ -71,7 +71,7 @@ uses
 const
   (* Max. supported version by this header *)
   LIBAVUTIL_MAX_VERSION_MAJOR   = 50;
-  LIBAVUTIL_MAX_VERSION_MINOR   = 7;
+  LIBAVUTIL_MAX_VERSION_MINOR   = 9;
   LIBAVUTIL_MAX_VERSION_RELEASE = 0;
   LIBAVUTIL_MAX_VERSION = (LIBAVUTIL_MAX_VERSION_MAJOR * VERSION_MAJOR) +
                           (LIBAVUTIL_MAX_VERSION_MINOR * VERSION_MINOR) +
-- 
cgit v1.2.3


From a6db8d3dae4c64681031c22d567f6d16322da2a1 Mon Sep 17 00:00:00 2001
From: tobigun <tobigun@b956fd51-792f-4845-bead-9b4dfca2ff2c>
Date: Mon, 26 Apr 2010 08:32:45 +0000
Subject: added a warning that adjusting the max supported FFmpeg manually is
 not a valid fix and as a consequence random crashes or bugs may occur. The
 USDX team does not give any support for USDX with manually adjusted FFmpeg
 headers.

git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@2311 b956fd51-792f-4845-bead-9b4dfca2ff2c
---
 src/lib/ffmpeg/avutil.pas | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)

(limited to 'src/lib/ffmpeg/avutil.pas')

diff --git a/src/lib/ffmpeg/avutil.pas b/src/lib/ffmpeg/avutil.pas
index 0cf5f120..5de75abd 100644
--- a/src/lib/ffmpeg/avutil.pas
+++ b/src/lib/ffmpeg/avutil.pas
@@ -69,6 +69,31 @@ uses
   UConfig;
 
 const
+  (*
+   * IMPORTANT: The official FFmpeg C headers change very quickly. Often some
+   * of the data structures are changed so that they become incompatible with
+   * older header files. The Pascal headers have to be adjusted to those changes,
+   * otherwise the application might crash randomly or strange bugs (not
+   * necessarily related to video or audio due to buffer overflows etc.) might
+   * occur.
+   *
+   * In the past users reported problems with USDX that took hours to fix and
+   * the problem was an unsupported version of FFmpeg. So we decided to disable
+   * support for future versions of FFmpeg until the headers are revised by us
+   * for that version as they otherwise most probably will break USDX.
+   *
+   * If the headers do not yet support your FFmpeg version you may want to
+   * adjust the max. version numbers manually but please note: it may work but
+   * in many cases it does not. The USDX team does NOT PROVIDE ANY SUPPORT
+   * for the game if the MAX. VERSION WAS CHANGED.
+   *
+   * The only safe way to support new versions of FFmpeg is to add the changes
+   * of the FFmpeg git repository C headers to the Pascal headers.
+   * You can accelerate this process by posting a patch with the git changes
+   * translated to Pascal to our bug tracker (please join our IRC chat before
+   * you start working on it). Simply adjusting the max. versions is NOT a valid
+   * fix. 
+   *)
   (* Max. supported version by this header *)
   LIBAVUTIL_MAX_VERSION_MAJOR   = 50;
   LIBAVUTIL_MAX_VERSION_MINOR   = 9;
-- 
cgit v1.2.3


From 0a10e0be5f8dc24b3bd049d763f50e8707d06364 Mon Sep 17 00:00:00 2001
From: k-m_schindler <k-m_schindler@b956fd51-792f-4845-bead-9b4dfca2ff2c>
Date: Tue, 11 May 2010 20:16:38 +0000
Subject: update avutils stuff to revision 31050

git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@2356 b956fd51-792f-4845-bead-9b4dfca2ff2c
---
 src/lib/ffmpeg/avutil.pas | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

(limited to 'src/lib/ffmpeg/avutil.pas')

diff --git a/src/lib/ffmpeg/avutil.pas b/src/lib/ffmpeg/avutil.pas
index 5de75abd..07412d80 100644
--- a/src/lib/ffmpeg/avutil.pas
+++ b/src/lib/ffmpeg/avutil.pas
@@ -28,8 +28,8 @@
  * Conversions of
  *
  * libavutil/avutil.h:
- *  Min. version: 49.0.1, revision 6577,  Sat Oct 7 15:30:46 2006 UTC
- *  Max. version: 49.14.0, revision 16912, Sun Feb 1 02:00:19 2009 UTC
+ *  Min. version: 49.0.1, revision 6577,  Sat Oct  7 15:30:46 2006 UTC
+ *  Max. version: 50.9.0, revision 16912, Tue May 11 22:05:00 2010 CET
  *
  * libavutil/mem.h:
  *  revision 16590, Tue Jan 13 23:44:16 2009 UTC
@@ -37,13 +37,10 @@
  * libavutil/log.h:
  *  revision 16571, Tue Jan 13 00:14:43 2009 UTC
  *
- * Update changes auf avutil.h, mem.h and log.h
- * Max. version 50.7.0, Tue, Dec 29 0:30:00 2009 UTC 
  * include/keep pixfmt.h (change in revision 50.01.0)
  * Maybe, the pixelformats are not needed, but it has not been checked.
  * log.h is only partial.
  *
- * update Sun to 50.9.0, Feb 21, 2010
  *)
 
 unit avutil;
-- 
cgit v1.2.3


From 3db75f59e91a3e556b7beb3ddfae9bdac69992fc Mon Sep 17 00:00:00 2001
From: k-m_schindler <k-m_schindler@b956fd51-792f-4845-bead-9b4dfca2ff2c>
Date: Tue, 11 May 2010 20:50:31 +0000
Subject: update to avutil 50.12.0

git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@2357 b956fd51-792f-4845-bead-9b4dfca2ff2c
---
 src/lib/ffmpeg/avutil.pas | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'src/lib/ffmpeg/avutil.pas')

diff --git a/src/lib/ffmpeg/avutil.pas b/src/lib/ffmpeg/avutil.pas
index 07412d80..975aaa36 100644
--- a/src/lib/ffmpeg/avutil.pas
+++ b/src/lib/ffmpeg/avutil.pas
@@ -28,8 +28,8 @@
  * Conversions of
  *
  * libavutil/avutil.h:
- *  Min. version: 49.0.1, revision 6577,  Sat Oct  7 15:30:46 2006 UTC
- *  Max. version: 50.9.0, revision 16912, Tue May 11 22:05:00 2010 CET
+ *  Min. version: 49.0.1,  revision  6577, Sat Oct  7 15:30:46 2006 UTC
+ *  Max. version: 50.12.0, revision 22501, Tue May 11 22:05:00 2010 CET
  *
  * libavutil/mem.h:
  *  revision 16590, Tue Jan 13 23:44:16 2009 UTC
@@ -93,7 +93,7 @@ const
    *)
   (* Max. supported version by this header *)
   LIBAVUTIL_MAX_VERSION_MAJOR   = 50;
-  LIBAVUTIL_MAX_VERSION_MINOR   = 9;
+  LIBAVUTIL_MAX_VERSION_MINOR   = 12;
   LIBAVUTIL_MAX_VERSION_RELEASE = 0;
   LIBAVUTIL_MAX_VERSION = (LIBAVUTIL_MAX_VERSION_MAJOR * VERSION_MAJOR) +
                           (LIBAVUTIL_MAX_VERSION_MINOR * VERSION_MINOR) +
-- 
cgit v1.2.3


From 373acf580c576f6f0f188b27ce1d1015451c1c27 Mon Sep 17 00:00:00 2001
From: k-m_schindler <k-m_schindler@b956fd51-792f-4845-bead-9b4dfca2ff2c>
Date: Tue, 11 May 2010 21:41:42 +0000
Subject: update to avutil 50.14.0

git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@2359 b956fd51-792f-4845-bead-9b4dfca2ff2c
---
 src/lib/ffmpeg/avutil.pas | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

(limited to 'src/lib/ffmpeg/avutil.pas')

diff --git a/src/lib/ffmpeg/avutil.pas b/src/lib/ffmpeg/avutil.pas
index 975aaa36..67208837 100644
--- a/src/lib/ffmpeg/avutil.pas
+++ b/src/lib/ffmpeg/avutil.pas
@@ -29,7 +29,7 @@
  *
  * libavutil/avutil.h:
  *  Min. version: 49.0.1,  revision  6577, Sat Oct  7 15:30:46 2006 UTC
- *  Max. version: 50.12.0, revision 22501, Tue May 11 22:05:00 2010 CET
+ *  Max. version: 50.14.0, revision 22736, Tue May 11 22:05:00 2010 CET
  *
  * libavutil/mem.h:
  *  revision 16590, Tue Jan 13 23:44:16 2009 UTC
@@ -93,7 +93,7 @@ const
    *)
   (* Max. supported version by this header *)
   LIBAVUTIL_MAX_VERSION_MAJOR   = 50;
-  LIBAVUTIL_MAX_VERSION_MINOR   = 12;
+  LIBAVUTIL_MAX_VERSION_MINOR   = 14;
   LIBAVUTIL_MAX_VERSION_RELEASE = 0;
   LIBAVUTIL_MAX_VERSION = (LIBAVUTIL_MAX_VERSION_MAJOR * VERSION_MAJOR) +
                           (LIBAVUTIL_MAX_VERSION_MINOR * VERSION_MINOR) +
@@ -138,6 +138,19 @@ function avutil_license(): PAnsiChar;
   cdecl; external av__format;
 {$IFEND}
 
+{$IF LIBAVUTIL_VERSION >= 50014000} // >= 50.14.0
+type
+  TAVMediaType = (
+    AVMEDIA_TYPE_UNKNOWN = -1,
+    AVMEDIA_TYPE_VIDEO,
+    AVMEDIA_TYPE_AUDIO,
+    AVMEDIA_TYPE_DATA,
+    AVMEDIA_TYPE_SUBTITLE,
+    AVMEDIA_TYPE_ATTACHMENT,
+    AVMEDIA_TYPE_NB
+  );
+{$IFEND}
+
 (* libavutil/pixfmt.h *)
 
 type
-- 
cgit v1.2.3


From 1cdbe92fe6af0604e976e469dea881fb7e7985ed Mon Sep 17 00:00:00 2001
From: k-m_schindler <k-m_schindler@b956fd51-792f-4845-bead-9b4dfca2ff2c>
Date: Tue, 11 May 2010 22:00:32 +0000
Subject: update to avutil 50.15.0

git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@2361 b956fd51-792f-4845-bead-9b4dfca2ff2c
---
 src/lib/ffmpeg/avutil.pas | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/lib/ffmpeg/avutil.pas')

diff --git a/src/lib/ffmpeg/avutil.pas b/src/lib/ffmpeg/avutil.pas
index 67208837..439e6ac2 100644
--- a/src/lib/ffmpeg/avutil.pas
+++ b/src/lib/ffmpeg/avutil.pas
@@ -29,7 +29,7 @@
  *
  * libavutil/avutil.h:
  *  Min. version: 49.0.1,  revision  6577, Sat Oct  7 15:30:46 2006 UTC
- *  Max. version: 50.14.0, revision 22736, Tue May 11 22:05:00 2010 CET
+ *  Max. version: 50.15.0, revision 22987, Tue May 11 22:05:00 2010 CET
  *
  * libavutil/mem.h:
  *  revision 16590, Tue Jan 13 23:44:16 2009 UTC
@@ -93,7 +93,7 @@ const
    *)
   (* Max. supported version by this header *)
   LIBAVUTIL_MAX_VERSION_MAJOR   = 50;
-  LIBAVUTIL_MAX_VERSION_MINOR   = 14;
+  LIBAVUTIL_MAX_VERSION_MINOR   = 15;
   LIBAVUTIL_MAX_VERSION_RELEASE = 0;
   LIBAVUTIL_MAX_VERSION = (LIBAVUTIL_MAX_VERSION_MAJOR * VERSION_MAJOR) +
                           (LIBAVUTIL_MAX_VERSION_MINOR * VERSION_MINOR) +
-- 
cgit v1.2.3


From ba94c02c9fcb65a6b1cd025bbadf1b0cd50f5152 Mon Sep 17 00:00:00 2001
From: k-m_schindler <k-m_schindler@b956fd51-792f-4845-bead-9b4dfca2ff2c>
Date: Tue, 11 May 2010 22:09:10 +0000
Subject: final ffmpeg update as of today: update all to avutil 50.15.2

git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@2362 b956fd51-792f-4845-bead-9b4dfca2ff2c
---
 src/lib/ffmpeg/avutil.pas | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/lib/ffmpeg/avutil.pas')

diff --git a/src/lib/ffmpeg/avutil.pas b/src/lib/ffmpeg/avutil.pas
index 439e6ac2..a1586def 100644
--- a/src/lib/ffmpeg/avutil.pas
+++ b/src/lib/ffmpeg/avutil.pas
@@ -29,7 +29,7 @@
  *
  * libavutil/avutil.h:
  *  Min. version: 49.0.1,  revision  6577, Sat Oct  7 15:30:46 2006 UTC
- *  Max. version: 50.15.0, revision 22987, Tue May 11 22:05:00 2010 CET
+ *  Max. version: 50.15.2, revision 23059, Tue May 11 22:05:00 2010 CET
  *
  * libavutil/mem.h:
  *  revision 16590, Tue Jan 13 23:44:16 2009 UTC
-- 
cgit v1.2.3


From c99aeae03ebbf61fda758636708bf5a0ff83aed0 Mon Sep 17 00:00:00 2001
From: k-m_schindler <k-m_schindler@b956fd51-792f-4845-bead-9b4dfca2ff2c>
Date: Wed, 12 May 2010 11:03:08 +0000
Subject: fix No. 1 of ffmpeg update.

git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@2363 b956fd51-792f-4845-bead-9b4dfca2ff2c
---
 src/lib/ffmpeg/avutil.pas | 55 +++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 55 insertions(+)

(limited to 'src/lib/ffmpeg/avutil.pas')

diff --git a/src/lib/ffmpeg/avutil.pas b/src/lib/ffmpeg/avutil.pas
index a1586def..dc7b647b 100644
--- a/src/lib/ffmpeg/avutil.pas
+++ b/src/lib/ffmpeg/avutil.pas
@@ -151,6 +151,61 @@ type
   );
 {$IFEND}
 
+(* libavutil/error.h *)
+
+{$IF LIBAVUTIL_VERSION >= 50012000} // >= 50.12.0
+const
+{$IF EINVAL > 0}
+  AVERROR_SIGN = -1;
+{$ELSE}
+  {* Some platforms have E* and errno already negated. *}
+  AVERROR_SIGN =  1;
+{$IFEND}
+
+(*
+#if EINVAL > 0
+#define AVERROR(e) (-(e)) {**< Returns a negative error code from a POSIX error code, to return from library functions. *}
+#define AVUNERROR(e) (-(e)) {**< Returns a POSIX error code from a library function error return value. *}
+#else
+{* Some platforms have E* and errno already negated. *}
+#define AVERROR(e) (e)
+#define AVUNERROR(e) (e)
+#endif
+*)
+
+const
+  AVERROR_UNKNOWN     = AVERROR_SIGN * EINVAL;  (**< unknown error *)
+  AVERROR_IO          = AVERROR_SIGN * EIO;     (**< I/O error *)
+  AVERROR_NUMEXPECTED = AVERROR_SIGN * EDOM;    (**< Number syntax expected in filename. *)
+  AVERROR_INVALIDDATA = AVERROR_SIGN * EINVAL;  (**< invalid data found *)
+  AVERROR_NOMEM       = AVERROR_SIGN * ENOMEM;  (**< not enough memory *)
+  AVERROR_NOFMT       = AVERROR_SIGN * EILSEQ;  (**< unknown format *)
+  AVERROR_NOTSUPP     = AVERROR_SIGN * ENOSYS;  (**< Operation not supported. *)
+  AVERROR_NOENT       = AVERROR_SIGN * ENOENT;  (**< No such file or directory. *)
+{$IF LIBAVCODEC_VERSION >= 52017000} // 52.17.0
+  AVERROR_EOF         = AVERROR_SIGN * EPIPE;   (**< End of file. *)
+{$IFEND}
+  // Note: function calls as constant-initializers are invalid
+  //AVERROR_PATCHWELCOME = -MKTAG('P','A','W','E'); {**< Not yet implemented in FFmpeg. Patches welcome. *}
+  AVERROR_PATCHWELCOME = -(ord('P') or (ord('A') shl 8) or (ord('W') shl 16) or (ord('E') shl 24));
+{$IFEND}
+
+{$IF LIBAVUTIL_VERSION >= 50013000} // >= 50.13.0
+(*
+ * Puts a description of the AVERROR code errnum in errbuf.
+ * In case of failure the global variable errno is set to indicate the
+ * error. Even in case of failure av_strerror() will print a generic
+ * error message indicating the errnum provided to errbuf.
+ *
+ * @param errbuf_size the size in bytes of errbuf
+ * @return 0 on success, a negative value if a description for errnum
+ * cannot be found
+ *)
+
+function av_strerror(errnum: cint; errbuf: Pchar; errbuf_size: cint): cint;
+  cdecl; external av__util;
+{$IFEND}
+
 (* libavutil/pixfmt.h *)
 
 type
-- 
cgit v1.2.3


From 96336ca0e078cdc425f52f5a0374d9546a0155c0 Mon Sep 17 00:00:00 2001
From: k-m_schindler <k-m_schindler@b956fd51-792f-4845-bead-9b4dfca2ff2c>
Date: Wed, 12 May 2010 12:53:06 +0000
Subject: fix No. 3 of ffmpeg update.

git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@2365 b956fd51-792f-4845-bead-9b4dfca2ff2c
---
 src/lib/ffmpeg/avutil.pas | 28 ++++++++++++++++++++++++++++
 1 file changed, 28 insertions(+)

(limited to 'src/lib/ffmpeg/avutil.pas')

diff --git a/src/lib/ffmpeg/avutil.pas b/src/lib/ffmpeg/avutil.pas
index dc7b647b..f9c3a382 100644
--- a/src/lib/ffmpeg/avutil.pas
+++ b/src/lib/ffmpeg/avutil.pas
@@ -154,6 +154,34 @@ type
 (* libavutil/error.h *)
 
 {$IF LIBAVUTIL_VERSION >= 50012000} // >= 50.12.0
+
+{* error handling *}
+
+const
+{$IFDEF UNIX}
+  ENOENT = ESysENOENT;
+  EIO    = ESysEIO;
+  ENOMEM = ESysENOMEM;
+  EINVAL = ESysEINVAL;
+  EDOM   = ESysEDOM;
+  ENOSYS = ESysENOSYS;
+  EILSEQ = ESysEILSEQ;
+  EPIPE  = ESysEPIPE;
+{$ELSE}
+  ENOENT = 2;
+  EIO    = 5;
+  ENOMEM = 12;
+  EINVAL = 22;
+  EPIPE  = 32;  // just an assumption. needs to be checked.
+  EDOM   = 33;
+  {$IFDEF MSWINDOWS}
+  // Note: we assume that ffmpeg was compiled with MinGW.
+  // This must be changed if DLLs were compiled with cygwin.
+  ENOSYS = 40;  // MSVC/MINGW: 40, CYGWIN: 88,  LINUX/FPC: 38
+  EILSEQ = 42;  // MSVC/MINGW: 42, CYGWIN: 138, LINUX/FPC: 84
+  {$ENDIF}
+{$ENDIF}
+
 const
 {$IF EINVAL > 0}
   AVERROR_SIGN = -1;
-- 
cgit v1.2.3


From 07c7dc9d960a61bf99db9abb347af9f740e1dceb Mon Sep 17 00:00:00 2001
From: k-m_schindler <k-m_schindler@b956fd51-792f-4845-bead-9b4dfca2ff2c>
Date: Wed, 12 May 2010 13:08:25 +0000
Subject: fix No. 4 of ffmpeg update.

git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@2366 b956fd51-792f-4845-bead-9b4dfca2ff2c
---
 src/lib/ffmpeg/avutil.pas | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'src/lib/ffmpeg/avutil.pas')

diff --git a/src/lib/ffmpeg/avutil.pas b/src/lib/ffmpeg/avutil.pas
index f9c3a382..0d11c4a5 100644
--- a/src/lib/ffmpeg/avutil.pas
+++ b/src/lib/ffmpeg/avutil.pas
@@ -63,6 +63,9 @@ uses
   ctypes,
   mathematics,
   rational,
+  {$IFDEF UNIX}
+  BaseUnix,
+  {$ENDIF}
   UConfig;
 
 const
-- 
cgit v1.2.3


From a289b5b40ec4a16eb05e2557b88c50f4de39840c Mon Sep 17 00:00:00 2001
From: k-m_schindler <k-m_schindler@b956fd51-792f-4845-bead-9b4dfca2ff2c>
Date: Wed, 12 May 2010 13:30:55 +0000
Subject: fix No. 5 of ffmpeg update.

git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@2367 b956fd51-792f-4845-bead-9b4dfca2ff2c
---
 src/lib/ffmpeg/avutil.pas | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/lib/ffmpeg/avutil.pas')

diff --git a/src/lib/ffmpeg/avutil.pas b/src/lib/ffmpeg/avutil.pas
index 0d11c4a5..cc1e3d44 100644
--- a/src/lib/ffmpeg/avutil.pas
+++ b/src/lib/ffmpeg/avutil.pas
@@ -141,7 +141,7 @@ function avutil_license(): PAnsiChar;
   cdecl; external av__format;
 {$IFEND}
 
-{$IF LIBAVUTIL_VERSION >= 50014000} // >= 50.14.0
+{$IF LIBAVUTIL_VERSION >= 50020000} // >= 50.14.0
 type
   TAVMediaType = (
     AVMEDIA_TYPE_UNKNOWN = -1,
-- 
cgit v1.2.3


From 724522cddc21d41d14f2ef343ae7e858c240e1d6 Mon Sep 17 00:00:00 2001
From: k-m_schindler <k-m_schindler@b956fd51-792f-4845-bead-9b4dfca2ff2c>
Date: Wed, 12 May 2010 13:46:46 +0000
Subject: comments re: TAVMediaType. no code change

git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@2368 b956fd51-792f-4845-bead-9b4dfca2ff2c
---
 src/lib/ffmpeg/avutil.pas | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

(limited to 'src/lib/ffmpeg/avutil.pas')

diff --git a/src/lib/ffmpeg/avutil.pas b/src/lib/ffmpeg/avutil.pas
index cc1e3d44..708b5533 100644
--- a/src/lib/ffmpeg/avutil.pas
+++ b/src/lib/ffmpeg/avutil.pas
@@ -141,7 +141,11 @@ function avutil_license(): PAnsiChar;
   cdecl; external av__format;
 {$IFEND}
 
-{$IF LIBAVUTIL_VERSION >= 50020000} // >= 50.14.0
+{
+  TAVMediaType moved to avutil in LIBAVUTIL_VERSION 50.14.0
+  but moving it in the pascal headers was not really necessary
+  but caused problems. So, I (KMS) left it there.
+
 type
   TAVMediaType = (
     AVMEDIA_TYPE_UNKNOWN = -1,
@@ -152,7 +156,7 @@ type
     AVMEDIA_TYPE_ATTACHMENT,
     AVMEDIA_TYPE_NB
   );
-{$IFEND}
+}
 
 (* libavutil/error.h *)
 
-- 
cgit v1.2.3


From 5087c463c4a8c02f3d50e1d669aabcf2b178f820 Mon Sep 17 00:00:00 2001
From: k-m_schindler <k-m_schindler@b956fd51-792f-4845-bead-9b4dfca2ff2c>
Date: Sun, 16 May 2010 15:22:52 +0000
Subject: test of changing from LIBAVUTIL_VERSION to LIBAVUTIL_VERSION_INT

git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@2371 b956fd51-792f-4845-bead-9b4dfca2ff2c
---
 src/lib/ffmpeg/avutil.pas | 34 +++++++++++++++++-----------------
 1 file changed, 17 insertions(+), 17 deletions(-)

(limited to 'src/lib/ffmpeg/avutil.pas')

diff --git a/src/lib/ffmpeg/avutil.pas b/src/lib/ffmpeg/avutil.pas
index 708b5533..503e14bf 100644
--- a/src/lib/ffmpeg/avutil.pas
+++ b/src/lib/ffmpeg/avutil.pas
@@ -119,7 +119,7 @@ const
   {$MESSAGE Error 'Linked version of libavutil is not yet supported!'}
 {$IFEND}
 
-{$IF LIBAVUTIL_VERSION >= 49008000} // 49.8.0
+{$IF LIBAVUTIL_VERSION_INT >= 49008000} // 49.8.0
 (**
  * Returns the LIBAVUTIL_VERSION_INT constant.
  *)
@@ -127,7 +127,7 @@ function avutil_version(): cuint;
   cdecl; external av__format;
 {$IFEND}
 
-{$IF LIBAVUTIL_VERSION >= 50004000} // >= 50.4.0
+{$IF LIBAVUTIL_VERSION_INT >= 50004000} // >= 50.4.0
 (**
  * Returns the libavutil build-time configuration.
  *)
@@ -160,7 +160,7 @@ type
 
 (* libavutil/error.h *)
 
-{$IF LIBAVUTIL_VERSION >= 50012000} // >= 50.12.0
+{$IF LIBAVUTIL_VERSION_INT >= 50012000} // >= 50.12.0
 
 {* error handling *}
 
@@ -225,7 +225,7 @@ const
   AVERROR_PATCHWELCOME = -(ord('P') or (ord('A') shl 8) or (ord('W') shl 16) or (ord('E') shl 24));
 {$IFEND}
 
-{$IF LIBAVUTIL_VERSION >= 50013000} // >= 50.13.0
+{$IF LIBAVUTIL_VERSION_INT >= 50013000} // >= 50.13.0
 (*
  * Puts a description of the AVERROR code errnum in errbuf.
  * In case of failure the global variable errno is set to indicate the
@@ -280,12 +280,12 @@ type
     PIX_FMT_BGR24,     ///< packed RGB 8:8:8, 24bpp, BGRBGR...
     PIX_FMT_YUV422P,   ///< planar YUV 4:2:2, 16bpp, (1 Cr & Cb sample per 2x1 Y samples)
     PIX_FMT_YUV444P,   ///< planar YUV 4:4:4, 24bpp, (1 Cr & Cb sample per 1x1 Y samples)
-{$IF LIBAVUTIL_VERSION <= 50001000} // 50.01.0
+{$IF LIBAVUTIL_VERSION_INT <= 50001000} // 50.01.0
     PIX_FMT_RGB32,     ///< packed RGB 8:8:8, 32bpp, (msb)8A 8R 8G 8B(lsb), in CPU endianness
 {$IFEND}
     PIX_FMT_YUV410P,   ///< planar YUV 4:1:0,  9bpp, (1 Cr & Cb sample per 4x4 Y samples)
     PIX_FMT_YUV411P,   ///< planar YUV 4:1:1, 12bpp, (1 Cr & Cb sample per 4x1 Y samples)
-{$IF LIBAVUTIL_VERSION <= 50000000} // 50.00.0
+{$IF LIBAVUTIL_VERSION_INT <= 50000000} // 50.00.0
     PIX_FMT_RGB565,    ///< packed RGB 5:6:5, 16bpp, (msb)   5R 6G 5B(lsb), in CPU endianness
     PIX_FMT_RGB555,    ///< packed RGB 5:5:5, 16bpp, (msb)1A 5R 5G 5B(lsb), in CPU endianness, most significant bit to 0
 {$IFEND}
@@ -300,10 +300,10 @@ type
     PIX_FMT_XVMC_MPEG2_IDCT,
     PIX_FMT_UYVY422,   ///< packed YUV 4:2:2, 16bpp, Cb Y0 Cr Y1
     PIX_FMT_UYYVYY411, ///< packed YUV 4:1:1, 12bpp, Cb Y0 Y1 Cr Y2 Y3
-{$IF LIBAVUTIL_VERSION <= 50001000} // 50.01.0
+{$IF LIBAVUTIL_VERSION_INT <= 50001000} // 50.01.0
     PIX_FMT_BGR32,     ///< packed RGB 8:8:8, 32bpp, (msb)8A 8B 8G 8R(lsb), in CPU endianness
 {$IFEND}
-{$IF LIBAVUTIL_VERSION <= 50000000} // 50.00.0
+{$IF LIBAVUTIL_VERSION_INT <= 50000000} // 50.00.0
     PIX_FMT_BGR565,    ///< packed RGB 5:6:5, 16bpp, (msb)   5B 6G 5R(lsb), in CPU endianness
     PIX_FMT_BGR555,    ///< packed RGB 5:5:5, 16bpp, (msb)1A 5B 5G 5R(lsb), in CPU endianness, most significant bit to 1
 {$IFEND}
@@ -315,7 +315,7 @@ type
     PIX_FMT_RGB4_BYTE, ///< packed RGB 1:2:1,  8bpp, (msb)1R 2G 1B(lsb)
     PIX_FMT_NV12,      ///< planar YUV 4:2:0, 12bpp, 1 plane for Y and 1 for UV
     PIX_FMT_NV21,      ///< as above, but U and V bytes are swapped
-{$IF LIBAVUTIL_VERSION <= 50001000} // 50.01.0
+{$IF LIBAVUTIL_VERSION_INT <= 50001000} // 50.01.0
     PIX_FMT_RGB32_1,   ///< packed RGB 8:8:8, 32bpp, (msb)8R 8G 8B 8A(lsb), in CPU endianness
     PIX_FMT_BGR32_1,   ///< packed RGB 8:8:8, 32bpp, (msb)8B 8G 8R 8A(lsb), in CPU endianness
 {$ELSE} // 50.02.0
@@ -334,11 +334,11 @@ type
     PIX_FMT_VDPAU_MPEG2,///< MPEG-2 HW decoding with VDPAU, data[0] contains a vdpau_render_state struct which contains the bitstream of the slices as well as various fields extracted from headers
     PIX_FMT_VDPAU_WMV3,///< WMV3 HW decoding with VDPAU, data[0] contains a vdpau_render_state struct which contains the bitstream of the slices as well as various fields extracted from headers
     PIX_FMT_VDPAU_VC1, ///< VC-1 HW decoding with VDPAU, data[0] contains a vdpau_render_state struct which contains the bitstream of the slices as well as various fields extracted from headers
-{$IF LIBAVUTIL_VERSION >= 49015000} // 49.15.0
+{$IF LIBAVUTIL_VERSION_INT >= 49015000} // 49.15.0
     PIX_FMT_RGB48BE,   ///< packed RGB 16:16:16, 48bpp, 16R, 16G, 16B, big-endian
     PIX_FMT_RGB48LE,   ///< packed RGB 16:16:16, 48bpp, 16R, 16G, 16B, little-endian
 {$IFEND}
-{$IF LIBAVUTIL_VERSION >= 50001000} // 50.01.0
+{$IF LIBAVUTIL_VERSION_INT >= 50001000} // 50.01.0
     PIX_FMT_RGB565BE,  ///< packed RGB 5:6:5, 16bpp, (msb)   5R 6G 5B(lsb), big-endian
     PIX_FMT_RGB565LE,  ///< packed RGB 5:6:5, 16bpp, (msb)   5R 6G 5B(lsb), little-endian
     PIX_FMT_RGB555BE,  ///< packed RGB 5:5:5, 16bpp, (msb)1A 5R 5G 5B(lsb), big-endian, most significant bit to 0
@@ -358,7 +358,7 @@ type
 
 const
 {$ifdef WORDS_BIGENDIAN}
-  {$IF LIBAVUTIL_VERSION <= 50001000} // 50.01.0
+  {$IF LIBAVUTIL_VERSION_INT <= 50001000} // 50.01.0
     PIX_FMT_RGBA    = PIX_FMT_RGB32_1;
     PIX_FMT_BGRA    = PIX_FMT_BGR32_1;
     PIX_FMT_ARGB    = PIX_FMT_RGB32;
@@ -370,17 +370,17 @@ const
     PIX_FMT_BGR32_1 = PIX_FMT_BGRA;
   {$IFEND}
   PIX_FMT_GRAY16  = PIX_FMT_GRAY16BE;
-  {$IF LIBAVUTIL_VERSION >= 49015000} // 49.15.0
+  {$IF LIBAVUTIL_VERSION_INT >= 49015000} // 49.15.0
     PIX_FMT_RGB48   = PIX_FMT_RGB48BE;
   {$IFEND}
-  {$IF LIBAVUTIL_VERSION >= 50001000} // 50.01.0
+  {$IF LIBAVUTIL_VERSION_INT >= 50001000} // 50.01.0
     PIX_FMT_RGB565  = PIX_FMT_RGB565BE;
     PIX_FMT_RGB555  = PIX_FMT_RGB555BE;
     PIX_FMT_BGR565  = PIX_FMT_BGR565BE;
     PIX_FMT_BGR555  = PIX_FMT_BGR555BE
   {$IFEND}
 {$else}
-  {$IF LIBAVUTIL_VERSION <= 50001000} // 50.01.0
+  {$IF LIBAVUTIL_VERSION_INT <= 50001000} // 50.01.0
     PIX_FMT_RGBA    = PIX_FMT_BGR32;
     PIX_FMT_BGRA    = PIX_FMT_RGB32;
     PIX_FMT_ARGB    = PIX_FMT_BGR32_1;
@@ -392,10 +392,10 @@ const
     PIX_FMT_BGR32_1 = PIX_FMT_ARGB;
   {$IFEND}
   PIX_FMT_GRAY16  = PIX_FMT_GRAY16LE;
-  {$IF LIBAVUTIL_VERSION >= 49015000} // 49.15.0
+  {$IF LIBAVUTIL_VERSION_INT >= 49015000} // 49.15.0
     PIX_FMT_RGB48   = PIX_FMT_RGB48LE;
   {$IFEND}
-  {$IF LIBAVUTIL_VERSION >= 50001000} // 50.01.0
+  {$IF LIBAVUTIL_VERSION_INT >= 50001000} // 50.01.0
     PIX_FMT_RGB565  = PIX_FMT_RGB565LE;
     PIX_FMT_RGB555  = PIX_FMT_RGB555LE;
     PIX_FMT_BGR565  = PIX_FMT_BGR565LE;
-- 
cgit v1.2.3


From e6222b85634defcf49bd9b74633c4acc86c011bc Mon Sep 17 00:00:00 2001
From: k-m_schindler <k-m_schindler@b956fd51-792f-4845-bead-9b4dfca2ff2c>
Date: Sun, 16 May 2010 15:36:34 +0000
Subject: revert previous buggy commit

git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@2372 b956fd51-792f-4845-bead-9b4dfca2ff2c
---
 src/lib/ffmpeg/avutil.pas | 36 ++++++++++++++++++------------------
 1 file changed, 18 insertions(+), 18 deletions(-)

(limited to 'src/lib/ffmpeg/avutil.pas')

diff --git a/src/lib/ffmpeg/avutil.pas b/src/lib/ffmpeg/avutil.pas
index 503e14bf..1c0fff0d 100644
--- a/src/lib/ffmpeg/avutil.pas
+++ b/src/lib/ffmpeg/avutil.pas
@@ -119,15 +119,15 @@ const
   {$MESSAGE Error 'Linked version of libavutil is not yet supported!'}
 {$IFEND}
 
-{$IF LIBAVUTIL_VERSION_INT >= 49008000} // 49.8.0
+{$IF LIBAVUTIL_VERSION >= 49008000} // 49.8.0
 (**
- * Returns the LIBAVUTIL_VERSION_INT constant.
+ * Returns the LIBAVUTIL_VERSION constant.
  *)
 function avutil_version(): cuint;
   cdecl; external av__format;
 {$IFEND}
 
-{$IF LIBAVUTIL_VERSION_INT >= 50004000} // >= 50.4.0
+{$IF LIBAVUTIL_VERSION >= 50004000} // >= 50.4.0
 (**
  * Returns the libavutil build-time configuration.
  *)
@@ -160,7 +160,7 @@ type
 
 (* libavutil/error.h *)
 
-{$IF LIBAVUTIL_VERSION_INT >= 50012000} // >= 50.12.0
+{$IF LIBAVUTIL_VERSION >= 50012000} // >= 50.12.0
 
 {* error handling *}
 
@@ -225,7 +225,7 @@ const
   AVERROR_PATCHWELCOME = -(ord('P') or (ord('A') shl 8) or (ord('W') shl 16) or (ord('E') shl 24));
 {$IFEND}
 
-{$IF LIBAVUTIL_VERSION_INT >= 50013000} // >= 50.13.0
+{$IF LIBAVUTIL_VERSION >= 50013000} // >= 50.13.0
 (*
  * Puts a description of the AVERROR code errnum in errbuf.
  * In case of failure the global variable errno is set to indicate the
@@ -280,12 +280,12 @@ type
     PIX_FMT_BGR24,     ///< packed RGB 8:8:8, 24bpp, BGRBGR...
     PIX_FMT_YUV422P,   ///< planar YUV 4:2:2, 16bpp, (1 Cr & Cb sample per 2x1 Y samples)
     PIX_FMT_YUV444P,   ///< planar YUV 4:4:4, 24bpp, (1 Cr & Cb sample per 1x1 Y samples)
-{$IF LIBAVUTIL_VERSION_INT <= 50001000} // 50.01.0
+{$IF LIBAVUTIL_VERSION <= 50001000} // 50.01.0
     PIX_FMT_RGB32,     ///< packed RGB 8:8:8, 32bpp, (msb)8A 8R 8G 8B(lsb), in CPU endianness
 {$IFEND}
     PIX_FMT_YUV410P,   ///< planar YUV 4:1:0,  9bpp, (1 Cr & Cb sample per 4x4 Y samples)
     PIX_FMT_YUV411P,   ///< planar YUV 4:1:1, 12bpp, (1 Cr & Cb sample per 4x1 Y samples)
-{$IF LIBAVUTIL_VERSION_INT <= 50000000} // 50.00.0
+{$IF LIBAVUTIL_VERSION <= 50000000} // 50.00.0
     PIX_FMT_RGB565,    ///< packed RGB 5:6:5, 16bpp, (msb)   5R 6G 5B(lsb), in CPU endianness
     PIX_FMT_RGB555,    ///< packed RGB 5:5:5, 16bpp, (msb)1A 5R 5G 5B(lsb), in CPU endianness, most significant bit to 0
 {$IFEND}
@@ -300,10 +300,10 @@ type
     PIX_FMT_XVMC_MPEG2_IDCT,
     PIX_FMT_UYVY422,   ///< packed YUV 4:2:2, 16bpp, Cb Y0 Cr Y1
     PIX_FMT_UYYVYY411, ///< packed YUV 4:1:1, 12bpp, Cb Y0 Y1 Cr Y2 Y3
-{$IF LIBAVUTIL_VERSION_INT <= 50001000} // 50.01.0
+{$IF LIBAVUTIL_VERSION <= 50001000} // 50.01.0
     PIX_FMT_BGR32,     ///< packed RGB 8:8:8, 32bpp, (msb)8A 8B 8G 8R(lsb), in CPU endianness
 {$IFEND}
-{$IF LIBAVUTIL_VERSION_INT <= 50000000} // 50.00.0
+{$IF LIBAVUTIL_VERSION <= 50000000} // 50.00.0
     PIX_FMT_BGR565,    ///< packed RGB 5:6:5, 16bpp, (msb)   5B 6G 5R(lsb), in CPU endianness
     PIX_FMT_BGR555,    ///< packed RGB 5:5:5, 16bpp, (msb)1A 5B 5G 5R(lsb), in CPU endianness, most significant bit to 1
 {$IFEND}
@@ -315,7 +315,7 @@ type
     PIX_FMT_RGB4_BYTE, ///< packed RGB 1:2:1,  8bpp, (msb)1R 2G 1B(lsb)
     PIX_FMT_NV12,      ///< planar YUV 4:2:0, 12bpp, 1 plane for Y and 1 for UV
     PIX_FMT_NV21,      ///< as above, but U and V bytes are swapped
-{$IF LIBAVUTIL_VERSION_INT <= 50001000} // 50.01.0
+{$IF LIBAVUTIL_VERSION <= 50001000} // 50.01.0
     PIX_FMT_RGB32_1,   ///< packed RGB 8:8:8, 32bpp, (msb)8R 8G 8B 8A(lsb), in CPU endianness
     PIX_FMT_BGR32_1,   ///< packed RGB 8:8:8, 32bpp, (msb)8B 8G 8R 8A(lsb), in CPU endianness
 {$ELSE} // 50.02.0
@@ -334,11 +334,11 @@ type
     PIX_FMT_VDPAU_MPEG2,///< MPEG-2 HW decoding with VDPAU, data[0] contains a vdpau_render_state struct which contains the bitstream of the slices as well as various fields extracted from headers
     PIX_FMT_VDPAU_WMV3,///< WMV3 HW decoding with VDPAU, data[0] contains a vdpau_render_state struct which contains the bitstream of the slices as well as various fields extracted from headers
     PIX_FMT_VDPAU_VC1, ///< VC-1 HW decoding with VDPAU, data[0] contains a vdpau_render_state struct which contains the bitstream of the slices as well as various fields extracted from headers
-{$IF LIBAVUTIL_VERSION_INT >= 49015000} // 49.15.0
+{$IF LIBAVUTIL_VERSION >= 49015000} // 49.15.0
     PIX_FMT_RGB48BE,   ///< packed RGB 16:16:16, 48bpp, 16R, 16G, 16B, big-endian
     PIX_FMT_RGB48LE,   ///< packed RGB 16:16:16, 48bpp, 16R, 16G, 16B, little-endian
 {$IFEND}
-{$IF LIBAVUTIL_VERSION_INT >= 50001000} // 50.01.0
+{$IF LIBAVUTIL_VERSION >= 50001000} // 50.01.0
     PIX_FMT_RGB565BE,  ///< packed RGB 5:6:5, 16bpp, (msb)   5R 6G 5B(lsb), big-endian
     PIX_FMT_RGB565LE,  ///< packed RGB 5:6:5, 16bpp, (msb)   5R 6G 5B(lsb), little-endian
     PIX_FMT_RGB555BE,  ///< packed RGB 5:5:5, 16bpp, (msb)1A 5R 5G 5B(lsb), big-endian, most significant bit to 0
@@ -358,7 +358,7 @@ type
 
 const
 {$ifdef WORDS_BIGENDIAN}
-  {$IF LIBAVUTIL_VERSION_INT <= 50001000} // 50.01.0
+  {$IF LIBAVUTIL_VERSION <= 50001000} // 50.01.0
     PIX_FMT_RGBA    = PIX_FMT_RGB32_1;
     PIX_FMT_BGRA    = PIX_FMT_BGR32_1;
     PIX_FMT_ARGB    = PIX_FMT_RGB32;
@@ -370,17 +370,17 @@ const
     PIX_FMT_BGR32_1 = PIX_FMT_BGRA;
   {$IFEND}
   PIX_FMT_GRAY16  = PIX_FMT_GRAY16BE;
-  {$IF LIBAVUTIL_VERSION_INT >= 49015000} // 49.15.0
+  {$IF LIBAVUTIL_VERSION >= 49015000} // 49.15.0
     PIX_FMT_RGB48   = PIX_FMT_RGB48BE;
   {$IFEND}
-  {$IF LIBAVUTIL_VERSION_INT >= 50001000} // 50.01.0
+  {$IF LIBAVUTIL_VERSION >= 50001000} // 50.01.0
     PIX_FMT_RGB565  = PIX_FMT_RGB565BE;
     PIX_FMT_RGB555  = PIX_FMT_RGB555BE;
     PIX_FMT_BGR565  = PIX_FMT_BGR565BE;
     PIX_FMT_BGR555  = PIX_FMT_BGR555BE
   {$IFEND}
 {$else}
-  {$IF LIBAVUTIL_VERSION_INT <= 50001000} // 50.01.0
+  {$IF LIBAVUTIL_VERSION <= 50001000} // 50.01.0
     PIX_FMT_RGBA    = PIX_FMT_BGR32;
     PIX_FMT_BGRA    = PIX_FMT_RGB32;
     PIX_FMT_ARGB    = PIX_FMT_BGR32_1;
@@ -392,10 +392,10 @@ const
     PIX_FMT_BGR32_1 = PIX_FMT_ARGB;
   {$IFEND}
   PIX_FMT_GRAY16  = PIX_FMT_GRAY16LE;
-  {$IF LIBAVUTIL_VERSION_INT >= 49015000} // 49.15.0
+  {$IF LIBAVUTIL_VERSION >= 49015000} // 49.15.0
     PIX_FMT_RGB48   = PIX_FMT_RGB48LE;
   {$IFEND}
-  {$IF LIBAVUTIL_VERSION_INT >= 50001000} // 50.01.0
+  {$IF LIBAVUTIL_VERSION >= 50001000} // 50.01.0
     PIX_FMT_RGB565  = PIX_FMT_RGB565LE;
     PIX_FMT_RGB555  = PIX_FMT_RGB555LE;
     PIX_FMT_BGR565  = PIX_FMT_BGR565LE;
-- 
cgit v1.2.3


From 0bf9f6b5cf3c650e791bc45a9371b83dc557cccf Mon Sep 17 00:00:00 2001
From: k-m_schindler <k-m_schindler@b956fd51-792f-4845-bead-9b4dfca2ff2c>
Date: Sun, 16 May 2010 15:41:32 +0000
Subject: correct small glitch in comment

git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@2373 b956fd51-792f-4845-bead-9b4dfca2ff2c
---
 src/lib/ffmpeg/avutil.pas | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/lib/ffmpeg/avutil.pas')

diff --git a/src/lib/ffmpeg/avutil.pas b/src/lib/ffmpeg/avutil.pas
index 1c0fff0d..708b5533 100644
--- a/src/lib/ffmpeg/avutil.pas
+++ b/src/lib/ffmpeg/avutil.pas
@@ -121,7 +121,7 @@ const
 
 {$IF LIBAVUTIL_VERSION >= 49008000} // 49.8.0
 (**
- * Returns the LIBAVUTIL_VERSION constant.
+ * Returns the LIBAVUTIL_VERSION_INT constant.
  *)
 function avutil_version(): cuint;
   cdecl; external av__format;
-- 
cgit v1.2.3


From 2f722e409c2e685e602689d16d69466eae624f1d Mon Sep 17 00:00:00 2001
From: k-m_schindler <k-m_schindler@b956fd51-792f-4845-bead-9b4dfca2ff2c>
Date: Sun, 16 May 2010 18:02:07 +0000
Subject: adding some markers for debugging.

git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@2374 b956fd51-792f-4845-bead-9b4dfca2ff2c
---
 src/lib/ffmpeg/avutil.pas | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'src/lib/ffmpeg/avutil.pas')

diff --git a/src/lib/ffmpeg/avutil.pas b/src/lib/ffmpeg/avutil.pas
index 708b5533..ef67bd07 100644
--- a/src/lib/ffmpeg/avutil.pas
+++ b/src/lib/ffmpeg/avutil.pas
@@ -160,8 +160,12 @@ type
 
 (* libavutil/error.h *)
 
+{$MESSAGE Note libavutil marker}
+
 {$IF LIBAVUTIL_VERSION >= 50012000} // >= 50.12.0
 
+{$MESSAGE INFO LIBAVUTIL_VERSION >= 50012000!}
+
 {* error handling *}
 
 const
@@ -190,6 +194,7 @@ const
 {$ENDIF}
 
 const
+{$MESSAGE NoteYou should not get this libavutil marker!!!}
 {$IF EINVAL > 0}
   AVERROR_SIGN = -1;
 {$ELSE}
-- 
cgit v1.2.3


From 376d801304e16e522c50dffd02dc2b82d934efb8 Mon Sep 17 00:00:00 2001
From: k-m_schindler <k-m_schindler@b956fd51-792f-4845-bead-9b4dfca2ff2c>
Date: Sun, 16 May 2010 18:10:27 +0000
Subject: markers for debugging changed.

git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@2375 b956fd51-792f-4845-bead-9b4dfca2ff2c
---
 src/lib/ffmpeg/avutil.pas | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'src/lib/ffmpeg/avutil.pas')

diff --git a/src/lib/ffmpeg/avutil.pas b/src/lib/ffmpeg/avutil.pas
index ef67bd07..4f344e14 100644
--- a/src/lib/ffmpeg/avutil.pas
+++ b/src/lib/ffmpeg/avutil.pas
@@ -160,11 +160,11 @@ type
 
 (* libavutil/error.h *)
 
-{$MESSAGE Note libavutil marker}
+{$MESSAGE Warning 'libavutil marker'}
 
 {$IF LIBAVUTIL_VERSION >= 50012000} // >= 50.12.0
 
-{$MESSAGE INFO LIBAVUTIL_VERSION >= 50012000!}
+{$MESSAGE Warning 'LIBAVUTIL_VERSION >= 50012000!'}
 
 {* error handling *}
 
@@ -194,7 +194,7 @@ const
 {$ENDIF}
 
 const
-{$MESSAGE NoteYou should not get this libavutil marker!!!}
+{$MESSAGE Warning 'You should not get this libavutil marker!!!'}
 {$IF EINVAL > 0}
   AVERROR_SIGN = -1;
 {$ELSE}
-- 
cgit v1.2.3


From c227fad8311d25fc5f91b1b959e7b45f543ca0be Mon Sep 17 00:00:00 2001
From: k-m_schindler <k-m_schindler@b956fd51-792f-4845-bead-9b4dfca2ff2c>
Date: Sun, 16 May 2010 18:29:31 +0000
Subject: different way for conditional compilation

git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@2376 b956fd51-792f-4845-bead-9b4dfca2ff2c
---
 src/lib/ffmpeg/avutil.pas | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

(limited to 'src/lib/ffmpeg/avutil.pas')

diff --git a/src/lib/ffmpeg/avutil.pas b/src/lib/ffmpeg/avutil.pas
index 4f344e14..385b7e3d 100644
--- a/src/lib/ffmpeg/avutil.pas
+++ b/src/lib/ffmpeg/avutil.pas
@@ -160,11 +160,11 @@ type
 
 (* libavutil/error.h *)
 
-{$MESSAGE Warning 'libavutil marker'}
-
 {$IF LIBAVUTIL_VERSION >= 50012000} // >= 50.12.0
+  {$DEFINE NEED_ERRORS_HERE}
+{$IFEND}
 
-{$MESSAGE Warning 'LIBAVUTIL_VERSION >= 50012000!'}
+{$IFDEF NEED_ERRORS_HERE}
 
 {* error handling *}
 
@@ -194,7 +194,6 @@ const
 {$ENDIF}
 
 const
-{$MESSAGE Warning 'You should not get this libavutil marker!!!'}
 {$IF EINVAL > 0}
   AVERROR_SIGN = -1;
 {$ELSE}
@@ -228,7 +227,7 @@ const
   // Note: function calls as constant-initializers are invalid
   //AVERROR_PATCHWELCOME = -MKTAG('P','A','W','E'); {**< Not yet implemented in FFmpeg. Patches welcome. *}
   AVERROR_PATCHWELCOME = -(ord('P') or (ord('A') shl 8) or (ord('W') shl 16) or (ord('E') shl 24));
-{$IFEND}
+{$ENDIF}
 
 {$IF LIBAVUTIL_VERSION >= 50013000} // >= 50.13.0
 (*
-- 
cgit v1.2.3


From a0846a75fdac01df21161ff4d76371544fab4c1a Mon Sep 17 00:00:00 2001
From: k-m_schindler <k-m_schindler@b956fd51-792f-4845-bead-9b4dfca2ff2c>
Date: Sun, 16 May 2010 21:57:58 +0000
Subject: arithmetic solution on bit level for AVERROR_SIGN. Delphi cannot
 handle the solution with directives. Still needs check on powerpc.

git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@2377 b956fd51-792f-4845-bead-9b4dfca2ff2c
---
 src/lib/ffmpeg/avutil.pas | 26 +++++++++++++++-----------
 1 file changed, 15 insertions(+), 11 deletions(-)

(limited to 'src/lib/ffmpeg/avutil.pas')

diff --git a/src/lib/ffmpeg/avutil.pas b/src/lib/ffmpeg/avutil.pas
index 385b7e3d..0ad7dd31 100644
--- a/src/lib/ffmpeg/avutil.pas
+++ b/src/lib/ffmpeg/avutil.pas
@@ -161,10 +161,6 @@ type
 (* libavutil/error.h *)
 
 {$IF LIBAVUTIL_VERSION >= 50012000} // >= 50.12.0
-  {$DEFINE NEED_ERRORS_HERE}
-{$IFEND}
-
-{$IFDEF NEED_ERRORS_HERE}
 
 {* error handling *}
 
@@ -193,13 +189,21 @@ const
   {$ENDIF}
 {$ENDIF}
 
+(**
+ * We need the sign of of the error, because some platforms have 
+ * E* and errno already negated. The previous version failed
+ * with Delphi, because it needs EINVAL defined.
+ * Warning: This code is platform dependent and assumes constants 
+ * to be 32 bit.
+ * This version does the following steps:
+ * 1) shr 6:         shifts the sign bit to bit position 2
+ * 2) and $00000002: sets all other bits to zero
+ *                   positive EINVAL gives 0, negative gives 2
+ * 3) not:           inverts all bits. This gives -1 and -3
+ * 4) + 2:           positive EINVAL gives 1, negative -1
+ *)
 const
-{$IF EINVAL > 0}
-  AVERROR_SIGN = -1;
-{$ELSE}
-  {* Some platforms have E* and errno already negated. *}
-  AVERROR_SIGN =  1;
-{$IFEND}
+  AVERROR_SIGN = not((EINVAL shr 6) and $00000002) + 2;
 
 (*
 #if EINVAL > 0
@@ -227,7 +231,7 @@ const
   // Note: function calls as constant-initializers are invalid
   //AVERROR_PATCHWELCOME = -MKTAG('P','A','W','E'); {**< Not yet implemented in FFmpeg. Patches welcome. *}
   AVERROR_PATCHWELCOME = -(ord('P') or (ord('A') shl 8) or (ord('W') shl 16) or (ord('E') shl 24));
-{$ENDIF}
+{$IFEND}
 
 {$IF LIBAVUTIL_VERSION >= 50013000} // >= 50.13.0
 (*
-- 
cgit v1.2.3


From 0cec1eb5695fcdacfc337fb9ba65200bdf99dac1 Mon Sep 17 00:00:00 2001
From: k-m_schindler <k-m_schindler@b956fd51-792f-4845-bead-9b4dfca2ff2c>
Date: Sun, 16 May 2010 22:32:09 +0000
Subject: bit shift corrected from 6 bit to 30 bit.

git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@2378 b956fd51-792f-4845-bead-9b4dfca2ff2c
---
 src/lib/ffmpeg/avutil.pas | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/lib/ffmpeg/avutil.pas')

diff --git a/src/lib/ffmpeg/avutil.pas b/src/lib/ffmpeg/avutil.pas
index 0ad7dd31..959e8fda 100644
--- a/src/lib/ffmpeg/avutil.pas
+++ b/src/lib/ffmpeg/avutil.pas
@@ -196,14 +196,14 @@ const
  * Warning: This code is platform dependent and assumes constants 
  * to be 32 bit.
  * This version does the following steps:
- * 1) shr 6:         shifts the sign bit to bit position 2
+ * 1) shr 30:        shifts the sign bit to bit position 2
  * 2) and $00000002: sets all other bits to zero
  *                   positive EINVAL gives 0, negative gives 2
  * 3) not:           inverts all bits. This gives -1 and -3
  * 4) + 2:           positive EINVAL gives 1, negative -1
  *)
 const
-  AVERROR_SIGN = not((EINVAL shr 6) and $00000002) + 2;
+  AVERROR_SIGN = not((EINVAL shr 30) and $00000002) + 2;
 
 (*
 #if EINVAL > 0
-- 
cgit v1.2.3


From a47d7c03324122b0bc04b536dd496a27180550de Mon Sep 17 00:00:00 2001
From: k-m_schindler <k-m_schindler@b956fd51-792f-4845-bead-9b4dfca2ff2c>
Date: Wed, 19 May 2010 16:44:58 +0000
Subject: the result of AVERROR_SIGN was wrong, just the wrong way round.

git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@2386 b956fd51-792f-4845-bead-9b4dfca2ff2c
---
 src/lib/ffmpeg/avutil.pas | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

(limited to 'src/lib/ffmpeg/avutil.pas')

diff --git a/src/lib/ffmpeg/avutil.pas b/src/lib/ffmpeg/avutil.pas
index 959e8fda..28669161 100644
--- a/src/lib/ffmpeg/avutil.pas
+++ b/src/lib/ffmpeg/avutil.pas
@@ -199,11 +199,10 @@ const
  * 1) shr 30:        shifts the sign bit to bit position 2
  * 2) and $00000002: sets all other bits to zero
  *                   positive EINVAL gives 0, negative gives 2
- * 3) not:           inverts all bits. This gives -1 and -3
- * 4) + 2:           positive EINVAL gives 1, negative -1
+ * 3) - 1:           positive EINVAL gives -1, negative 1
  *)
 const
-  AVERROR_SIGN = not((EINVAL shr 30) and $00000002) + 2;
+  AVERROR_SIGN = (EINVAL shr 30) and $00000002 - 1;
 
 (*
 #if EINVAL > 0
-- 
cgit v1.2.3


From eab3c9bdc64cfb02cb1197fec7ee8919a08fea00 Mon Sep 17 00:00:00 2001
From: k-m_schindler <k-m_schindler@b956fd51-792f-4845-bead-9b4dfca2ff2c>
Date: Wed, 19 May 2010 16:53:06 +0000
Subject: move new error stuff into extra file in correspondence to the
 original error.h. Should make maintainance easier.

git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@2387 b956fd51-792f-4845-bead-9b4dfca2ff2c
---
 src/lib/ffmpeg/avutil.pas | 90 +----------------------------------------------
 1 file changed, 1 insertion(+), 89 deletions(-)

(limited to 'src/lib/ffmpeg/avutil.pas')

diff --git a/src/lib/ffmpeg/avutil.pas b/src/lib/ffmpeg/avutil.pas
index 28669161..13f1fe33 100644
--- a/src/lib/ffmpeg/avutil.pas
+++ b/src/lib/ffmpeg/avutil.pas
@@ -158,95 +158,7 @@ type
   );
 }
 
-(* libavutil/error.h *)
-
-{$IF LIBAVUTIL_VERSION >= 50012000} // >= 50.12.0
-
-{* error handling *}
-
-const
-{$IFDEF UNIX}
-  ENOENT = ESysENOENT;
-  EIO    = ESysEIO;
-  ENOMEM = ESysENOMEM;
-  EINVAL = ESysEINVAL;
-  EDOM   = ESysEDOM;
-  ENOSYS = ESysENOSYS;
-  EILSEQ = ESysEILSEQ;
-  EPIPE  = ESysEPIPE;
-{$ELSE}
-  ENOENT = 2;
-  EIO    = 5;
-  ENOMEM = 12;
-  EINVAL = 22;
-  EPIPE  = 32;  // just an assumption. needs to be checked.
-  EDOM   = 33;
-  {$IFDEF MSWINDOWS}
-  // Note: we assume that ffmpeg was compiled with MinGW.
-  // This must be changed if DLLs were compiled with cygwin.
-  ENOSYS = 40;  // MSVC/MINGW: 40, CYGWIN: 88,  LINUX/FPC: 38
-  EILSEQ = 42;  // MSVC/MINGW: 42, CYGWIN: 138, LINUX/FPC: 84
-  {$ENDIF}
-{$ENDIF}
-
-(**
- * We need the sign of of the error, because some platforms have 
- * E* and errno already negated. The previous version failed
- * with Delphi, because it needs EINVAL defined.
- * Warning: This code is platform dependent and assumes constants 
- * to be 32 bit.
- * This version does the following steps:
- * 1) shr 30:        shifts the sign bit to bit position 2
- * 2) and $00000002: sets all other bits to zero
- *                   positive EINVAL gives 0, negative gives 2
- * 3) - 1:           positive EINVAL gives -1, negative 1
- *)
-const
-  AVERROR_SIGN = (EINVAL shr 30) and $00000002 - 1;
-
-(*
-#if EINVAL > 0
-#define AVERROR(e) (-(e)) {**< Returns a negative error code from a POSIX error code, to return from library functions. *}
-#define AVUNERROR(e) (-(e)) {**< Returns a POSIX error code from a library function error return value. *}
-#else
-{* Some platforms have E* and errno already negated. *}
-#define AVERROR(e) (e)
-#define AVUNERROR(e) (e)
-#endif
-*)
-
-const
-  AVERROR_UNKNOWN     = AVERROR_SIGN * EINVAL;  (**< unknown error *)
-  AVERROR_IO          = AVERROR_SIGN * EIO;     (**< I/O error *)
-  AVERROR_NUMEXPECTED = AVERROR_SIGN * EDOM;    (**< Number syntax expected in filename. *)
-  AVERROR_INVALIDDATA = AVERROR_SIGN * EINVAL;  (**< invalid data found *)
-  AVERROR_NOMEM       = AVERROR_SIGN * ENOMEM;  (**< not enough memory *)
-  AVERROR_NOFMT       = AVERROR_SIGN * EILSEQ;  (**< unknown format *)
-  AVERROR_NOTSUPP     = AVERROR_SIGN * ENOSYS;  (**< Operation not supported. *)
-  AVERROR_NOENT       = AVERROR_SIGN * ENOENT;  (**< No such file or directory. *)
-{$IF LIBAVCODEC_VERSION >= 52017000} // 52.17.0
-  AVERROR_EOF         = AVERROR_SIGN * EPIPE;   (**< End of file. *)
-{$IFEND}
-  // Note: function calls as constant-initializers are invalid
-  //AVERROR_PATCHWELCOME = -MKTAG('P','A','W','E'); {**< Not yet implemented in FFmpeg. Patches welcome. *}
-  AVERROR_PATCHWELCOME = -(ord('P') or (ord('A') shl 8) or (ord('W') shl 16) or (ord('E') shl 24));
-{$IFEND}
-
-{$IF LIBAVUTIL_VERSION >= 50013000} // >= 50.13.0
-(*
- * Puts a description of the AVERROR code errnum in errbuf.
- * In case of failure the global variable errno is set to indicate the
- * error. Even in case of failure av_strerror() will print a generic
- * error message indicating the errnum provided to errbuf.
- *
- * @param errbuf_size the size in bytes of errbuf
- * @return 0 on success, a negative value if a description for errnum
- * cannot be found
- *)
-
-function av_strerror(errnum: cint; errbuf: Pchar; errbuf_size: cint): cint;
-  cdecl; external av__util;
-{$IFEND}
+{$INCLUDE error.pas}
 
 (* libavutil/pixfmt.h *)
 
-- 
cgit v1.2.3


From c7ae63da30275a50c03183a15442c320378cd60c Mon Sep 17 00:00:00 2001
From: k-m_schindler <k-m_schindler@b956fd51-792f-4845-bead-9b4dfca2ff2c>
Date: Wed, 19 May 2010 17:19:39 +0000
Subject: update avformat to 52.63.0 and correct avutil version to 50.15.2

git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@2389 b956fd51-792f-4845-bead-9b4dfca2ff2c
---
 src/lib/ffmpeg/avutil.pas | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/lib/ffmpeg/avutil.pas')

diff --git a/src/lib/ffmpeg/avutil.pas b/src/lib/ffmpeg/avutil.pas
index 13f1fe33..397c5679 100644
--- a/src/lib/ffmpeg/avutil.pas
+++ b/src/lib/ffmpeg/avutil.pas
@@ -97,7 +97,7 @@ const
   (* Max. supported version by this header *)
   LIBAVUTIL_MAX_VERSION_MAJOR   = 50;
   LIBAVUTIL_MAX_VERSION_MINOR   = 15;
-  LIBAVUTIL_MAX_VERSION_RELEASE = 0;
+  LIBAVUTIL_MAX_VERSION_RELEASE = 2;
   LIBAVUTIL_MAX_VERSION = (LIBAVUTIL_MAX_VERSION_MAJOR * VERSION_MAJOR) +
                           (LIBAVUTIL_MAX_VERSION_MINOR * VERSION_MINOR) +
                           (LIBAVUTIL_MAX_VERSION_RELEASE * VERSION_RELEASE);
-- 
cgit v1.2.3


From d9f381ad9ae4ad30fe748e2b604d9196d0e4a846 Mon Sep 17 00:00:00 2001
From: k-m_schindler <k-m_schindler@b956fd51-792f-4845-bead-9b4dfca2ff2c>
Date: Wed, 19 May 2010 17:54:29 +0000
Subject: add MKBETAG from common.h and update a number of comments.

git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@2391 b956fd51-792f-4845-bead-9b4dfca2ff2c
---
 src/lib/ffmpeg/avutil.pas | 25 ++++++++++++++++---------
 1 file changed, 16 insertions(+), 9 deletions(-)

(limited to 'src/lib/ffmpeg/avutil.pas')

diff --git a/src/lib/ffmpeg/avutil.pas b/src/lib/ffmpeg/avutil.pas
index 397c5679..c26700c6 100644
--- a/src/lib/ffmpeg/avutil.pas
+++ b/src/lib/ffmpeg/avutil.pas
@@ -160,7 +160,7 @@ type
 
 {$INCLUDE error.pas}
 
-(* libavutil/pixfmt.h *)
+(* libavutil/pixfmt.h up to revision 23144, May 16 2010 *)
 
 type
 (**
@@ -209,8 +209,8 @@ type
     PIX_FMT_RGB555,    ///< packed RGB 5:5:5, 16bpp, (msb)1A 5R 5G 5B(lsb), in CPU endianness, most significant bit to 0
 {$IFEND}
     PIX_FMT_GRAY8,     ///<        Y        ,  8bpp
-    PIX_FMT_MONOWHITE, ///<        Y        ,  1bpp, 0 is white, 1 is black
-    PIX_FMT_MONOBLACK, ///<        Y        ,  1bpp, 0 is black, 1 is white
+    PIX_FMT_MONOWHITE, ///<        Y        ,  1bpp, 0 is white, 1 is black, in each byte pixels are ordered from the msb to the lsb
+    PIX_FMT_MONOBLACK, ///<        Y        ,  1bpp, 0 is black, 1 is white, in each byte pixels are ordered from the msb to the lsb
     PIX_FMT_PAL8,      ///< 8 bit with PIX_FMT_RGB32 palette
     PIX_FMT_YUVJ420P,  ///< planar YUV 4:2:0, 12bpp, full scale (JPEG)
     PIX_FMT_YUVJ422P,  ///< planar YUV 4:2:2, 16bpp, full scale (JPEG)
@@ -227,12 +227,12 @@ type
     PIX_FMT_BGR555,    ///< packed RGB 5:5:5, 16bpp, (msb)1A 5B 5G 5R(lsb), in CPU endianness, most significant bit to 1
 {$IFEND}
     PIX_FMT_BGR8,      ///< packed RGB 3:3:2,  8bpp, (msb)2B 3G 3R(lsb)
-    PIX_FMT_BGR4,      ///< packed RGB 1:2:1,  4bpp, (msb)1B 2G 1R(lsb)
+    PIX_FMT_BGR4,      ///< packed RGB 1:2:1, bitstream,  4bpp, (msb)1B 2G 1R(lsb), a byte contains two pixels, the first pixel in the byte is the one composed by the 4 msb bits
     PIX_FMT_BGR4_BYTE, ///< packed RGB 1:2:1,  8bpp, (msb)1B 2G 1R(lsb)
     PIX_FMT_RGB8,      ///< packed RGB 3:3:2,  8bpp, (msb)2R 3G 3B(lsb)
-    PIX_FMT_RGB4,      ///< packed RGB 1:2:1,  4bpp, (msb)1R 2G 1B(lsb)
+    PIX_FMT_RGB4,      ///< packed RGB 1:2:1, bitstream,  4bpp, (msb)1R 2G 1B(lsb), a byte contains two pixels, the first pixel in the byte is the one composed by the 4 msb bits
     PIX_FMT_RGB4_BYTE, ///< packed RGB 1:2:1,  8bpp, (msb)1R 2G 1B(lsb)
-    PIX_FMT_NV12,      ///< planar YUV 4:2:0, 12bpp, 1 plane for Y and 1 for UV
+    PIX_FMT_NV12,      ///< planar YUV 4:2:0, 12bpp, 1 plane for Y and 1 plane for the UV components, which are interleaved (first byte U and the following byte V)
     PIX_FMT_NV21,      ///< as above, but U and V bytes are swapped
 {$IF LIBAVUTIL_VERSION <= 50001000} // 50.01.0
     PIX_FMT_RGB32_1,   ///< packed RGB 8:8:8, 32bpp, (msb)8R 8G 8B 8A(lsb), in CPU endianness
@@ -254,8 +254,8 @@ type
     PIX_FMT_VDPAU_WMV3,///< WMV3 HW decoding with VDPAU, data[0] contains a vdpau_render_state struct which contains the bitstream of the slices as well as various fields extracted from headers
     PIX_FMT_VDPAU_VC1, ///< VC-1 HW decoding with VDPAU, data[0] contains a vdpau_render_state struct which contains the bitstream of the slices as well as various fields extracted from headers
 {$IF LIBAVUTIL_VERSION >= 49015000} // 49.15.0
-    PIX_FMT_RGB48BE,   ///< packed RGB 16:16:16, 48bpp, 16R, 16G, 16B, big-endian
-    PIX_FMT_RGB48LE,   ///< packed RGB 16:16:16, 48bpp, 16R, 16G, 16B, little-endian
+    PIX_FMT_RGB48BE,   ///< packed RGB 16:16:16, 48bpp, 16R, 16G, 16B, the 2-byte value for each R/G/B component is stored as big-endian
+    PIX_FMT_RGB48LE,   ///< packed RGB 16:16:16, 48bpp, 16R, 16G, 16B, the 2-byte value for each R/G/B component is stored as little-endian
 {$IFEND}
 {$IF LIBAVUTIL_VERSION >= 50001000} // 50.01.0
     PIX_FMT_RGB565BE,  ///< packed RGB 5:6:5, 16bpp, (msb)   5R 6G 5B(lsb), big-endian
@@ -328,9 +328,10 @@ const
   PIX_FMT_YUV422  = PIX_FMT_YUYV422;
 {$IFEND}
 
-(* libavutil/common.h *) // until now MKTAG is all from common.h KMS 9/6/2009
+(* 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;
 
 (* libavutil/mem.h *)
 
@@ -494,4 +495,10 @@ 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;
+begin
+  Result := (ord(d) or (ord(c) shl 8) or (ord(b) shl 16) or (ord(a) shl 24));
+end;
+
+
 end.
-- 
cgit v1.2.3


From 02fb7466f7298f0d81c3e41baffb29d72f2e615e Mon Sep 17 00:00:00 2001
From: k-m_schindler <k-m_schindler@b956fd51-792f-4845-bead-9b4dfca2ff2c>
Date: Sun, 30 May 2010 20:15:38 +0000
Subject: Update to avutil 50.16.0 and some cosmetics

git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@2432 b956fd51-792f-4845-bead-9b4dfca2ff2c
---
 src/lib/ffmpeg/avutil.pas | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

(limited to 'src/lib/ffmpeg/avutil.pas')

diff --git a/src/lib/ffmpeg/avutil.pas b/src/lib/ffmpeg/avutil.pas
index c26700c6..cca33620 100644
--- a/src/lib/ffmpeg/avutil.pas
+++ b/src/lib/ffmpeg/avutil.pas
@@ -14,22 +14,18 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the Free Software
  * 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.
  * - 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: 50.15.2, revision 23059, Tue May 11 22:05:00 2010 CET
+ *  Max. version: 50.16.0, revision 23255, Sun May 30 22:05:00 2010 CET
  *
  * libavutil/mem.h:
  *  revision 16590, Tue Jan 13 23:44:16 2009 UTC
@@ -96,8 +92,8 @@ const
    *)
   (* Max. supported version by this header *)
   LIBAVUTIL_MAX_VERSION_MAJOR   = 50;
-  LIBAVUTIL_MAX_VERSION_MINOR   = 15;
-  LIBAVUTIL_MAX_VERSION_RELEASE = 2;
+  LIBAVUTIL_MAX_VERSION_MINOR   = 16;
+  LIBAVUTIL_MAX_VERSION_RELEASE = 0;
   LIBAVUTIL_MAX_VERSION = (LIBAVUTIL_MAX_VERSION_MAJOR * VERSION_MAJOR) +
                           (LIBAVUTIL_MAX_VERSION_MINOR * VERSION_MINOR) +
                           (LIBAVUTIL_MAX_VERSION_RELEASE * VERSION_RELEASE);
@@ -486,6 +482,11 @@ void av_log_set_callback(void (*)(void*, int, const char*, va_list));
 void av_log_default_callback(void* ptr, int level, const char* fmt, va_list vl);
 **}
 
+{$IF LIBAVUTIL_VERSION >= 50015003} // 50.15.3
+function av_default_item_name (ctx: pointer): Pchar;
+  cdecl; external av__util;
+{$IFEND}
+
 implementation
 
 (* libavutil/common.h *)
@@ -500,5 +501,4 @@ begin
   Result := (ord(d) or (ord(c) shl 8) or (ord(b) shl 16) or (ord(a) shl 24));
 end;
 
-
 end.
-- 
cgit v1.2.3


From 49afe883b07fd22db57f0283ee31f1bb6dd0bbd7 Mon Sep 17 00:00:00 2001
From: tobigun <tobigun@b956fd51-792f-4845-bead-9b4dfca2ff2c>
Date: Sat, 5 Jun 2010 09:03:40 +0000
Subject: bugfix: avutil_version() is in libavutil not libavformat

git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@2441 b956fd51-792f-4845-bead-9b4dfca2ff2c
---
 src/lib/ffmpeg/avutil.pas | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'src/lib/ffmpeg/avutil.pas')

diff --git a/src/lib/ffmpeg/avutil.pas b/src/lib/ffmpeg/avutil.pas
index cca33620..5387a0f1 100644
--- a/src/lib/ffmpeg/avutil.pas
+++ b/src/lib/ffmpeg/avutil.pas
@@ -120,7 +120,7 @@ const
  * Returns the LIBAVUTIL_VERSION_INT constant.
  *)
 function avutil_version(): cuint;
-  cdecl; external av__format;
+  cdecl; external av__util;
 {$IFEND}
 
 {$IF LIBAVUTIL_VERSION >= 50004000} // >= 50.4.0
@@ -128,13 +128,13 @@ function avutil_version(): cuint;
  * Returns the libavutil build-time configuration.
  *)
 function avutil_configuration(): PAnsiChar;
-  cdecl; external av__format;
+  cdecl; external av__util;
 
 (**
  * Returns the libavutil license.
  *)
 function avutil_license(): PAnsiChar;
-  cdecl; external av__format;
+  cdecl; external av__util;
 {$IFEND}
 
 {
-- 
cgit v1.2.3


From b24b4b940f526f8fd41008618514a5dd4d1ff5f2 Mon Sep 17 00:00:00 2001
From: k-m_schindler <k-m_schindler@b956fd51-792f-4845-bead-9b4dfca2ff2c>
Date: Tue, 20 Jul 2010 23:14:21 +0000
Subject: update avutil to 50.18.0

git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@2601 b956fd51-792f-4845-bead-9b4dfca2ff2c
---
 src/lib/ffmpeg/avutil.pas | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/lib/ffmpeg/avutil.pas')

diff --git a/src/lib/ffmpeg/avutil.pas b/src/lib/ffmpeg/avutil.pas
index 5387a0f1..876d6f66 100644
--- a/src/lib/ffmpeg/avutil.pas
+++ b/src/lib/ffmpeg/avutil.pas
@@ -25,7 +25,7 @@
  *
  * libavutil/avutil.h:
  *  Min. version: 49.0.1,  revision  6577, Sat Oct  7 15:30:46 2006 UTC
- *  Max. version: 50.16.0, revision 23255, Sun May 30 22:05:00 2010 CET
+ *  Max. version: 50.18.0, revision 23551, Mon Jul 21 01:00:00 2010 CET
  *
  * libavutil/mem.h:
  *  revision 16590, Tue Jan 13 23:44:16 2009 UTC
@@ -92,7 +92,7 @@ const
    *)
   (* Max. supported version by this header *)
   LIBAVUTIL_MAX_VERSION_MAJOR   = 50;
-  LIBAVUTIL_MAX_VERSION_MINOR   = 16;
+  LIBAVUTIL_MAX_VERSION_MINOR   = 18;
   LIBAVUTIL_MAX_VERSION_RELEASE = 0;
   LIBAVUTIL_MAX_VERSION = (LIBAVUTIL_MAX_VERSION_MAJOR * VERSION_MAJOR) +
                           (LIBAVUTIL_MAX_VERSION_MINOR * VERSION_MINOR) +
-- 
cgit v1.2.3


From edd433542de5da18d8f1b510f87f0221eab058a8 Mon Sep 17 00:00:00 2001
From: k-m_schindler <k-m_schindler@b956fd51-792f-4845-bead-9b4dfca2ff2c>
Date: Tue, 20 Jul 2010 23:18:11 +0000
Subject: update avutil to 50.19.0

git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@2602 b956fd51-792f-4845-bead-9b4dfca2ff2c
---
 src/lib/ffmpeg/avutil.pas | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/lib/ffmpeg/avutil.pas')

diff --git a/src/lib/ffmpeg/avutil.pas b/src/lib/ffmpeg/avutil.pas
index 876d6f66..1b23f12b 100644
--- a/src/lib/ffmpeg/avutil.pas
+++ b/src/lib/ffmpeg/avutil.pas
@@ -25,7 +25,7 @@
  *
  * libavutil/avutil.h:
  *  Min. version: 49.0.1,  revision  6577, Sat Oct  7 15:30:46 2006 UTC
- *  Max. version: 50.18.0, revision 23551, Mon Jul 21 01:00:00 2010 CET
+ *  Max. version: 50.19.0, revision 23593, Mon Jul 21 01:00:00 2010 CET
  *
  * libavutil/mem.h:
  *  revision 16590, Tue Jan 13 23:44:16 2009 UTC
@@ -92,7 +92,7 @@ const
    *)
   (* Max. supported version by this header *)
   LIBAVUTIL_MAX_VERSION_MAJOR   = 50;
-  LIBAVUTIL_MAX_VERSION_MINOR   = 18;
+  LIBAVUTIL_MAX_VERSION_MINOR   = 19;
   LIBAVUTIL_MAX_VERSION_RELEASE = 0;
   LIBAVUTIL_MAX_VERSION = (LIBAVUTIL_MAX_VERSION_MAJOR * VERSION_MAJOR) +
                           (LIBAVUTIL_MAX_VERSION_MINOR * VERSION_MINOR) +
-- 
cgit v1.2.3


From 61c9caf331540e1be83acf2c5818774fd004712b Mon Sep 17 00:00:00 2001
From: k-m_schindler <k-m_schindler@b956fd51-792f-4845-bead-9b4dfca2ff2c>
Date: Tue, 20 Jul 2010 23:43:16 +0000
Subject: update avutil to 50.21.0

git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@2603 b956fd51-792f-4845-bead-9b4dfca2ff2c
---
 src/lib/ffmpeg/avutil.pas | 32 ++++++++++++++++----------------
 1 file changed, 16 insertions(+), 16 deletions(-)

(limited to 'src/lib/ffmpeg/avutil.pas')

diff --git a/src/lib/ffmpeg/avutil.pas b/src/lib/ffmpeg/avutil.pas
index 1b23f12b..ea3a1e29 100644
--- a/src/lib/ffmpeg/avutil.pas
+++ b/src/lib/ffmpeg/avutil.pas
@@ -25,13 +25,13 @@
  *
  * libavutil/avutil.h:
  *  Min. version: 49.0.1,  revision  6577, Sat Oct  7 15:30:46 2006 UTC
- *  Max. version: 50.19.0, revision 23593, Mon Jul 21 01:00:00 2010 CET
+ *  Max. version: 50.21.0, revision 24190, Wed Jul 21 01:00:00 2010 CET
  *
  * libavutil/mem.h:
- *  revision 16590, Tue Jan 13 23:44:16 2009 UTC
+ *  revision 23904, Wed Jul 21 01:00:00 2010 CET
  *
  * libavutil/log.h:
- *  revision 16571, Tue Jan 13 00:14:43 2009 UTC
+ *  revision 23972, Wed Jul 21 01:00:00 2010 CET
  *
  * include/keep pixfmt.h (change in revision 50.01.0)
  * Maybe, the pixelformats are not needed, but it has not been checked.
@@ -92,7 +92,7 @@ const
    *)
   (* Max. supported version by this header *)
   LIBAVUTIL_MAX_VERSION_MAJOR   = 50;
-  LIBAVUTIL_MAX_VERSION_MINOR   = 19;
+  LIBAVUTIL_MAX_VERSION_MINOR   = 21;
   LIBAVUTIL_MAX_VERSION_RELEASE = 0;
   LIBAVUTIL_MAX_VERSION = (LIBAVUTIL_MAX_VERSION_MAJOR * VERSION_MAJOR) +
                           (LIBAVUTIL_MAX_VERSION_MINOR * VERSION_MINOR) +
@@ -117,7 +117,7 @@ const
 
 {$IF LIBAVUTIL_VERSION >= 49008000} // 49.8.0
 (**
- * Returns the LIBAVUTIL_VERSION_INT constant.
+ * Return the LIBAVUTIL_VERSION_INT constant.
  *)
 function avutil_version(): cuint;
   cdecl; external av__util;
@@ -125,13 +125,13 @@ function avutil_version(): cuint;
 
 {$IF LIBAVUTIL_VERSION >= 50004000} // >= 50.4.0
 (**
- * Returns the libavutil build-time configuration.
+ * Return the libavutil build-time configuration.
  *)
 function avutil_configuration(): PAnsiChar;
   cdecl; external av__util;
 
 (**
- * Returns the libavutil license.
+ * Return the libavutil license.
  *)
 function avutil_license(): PAnsiChar;
   cdecl; external av__util;
@@ -334,7 +334,7 @@ function MKBETAG(a, b, c, d: AnsiChar): integer;
 (* memory handling functions *)
 
 (**
- * Allocates a block of size bytes with alignment suitable for all
+ * Allocate a block of size bytes with alignment suitable for all
  * memory accesses (including vectors if available on the CPU).
  * @param size Size in bytes for the memory block to be allocated.
  * @return Pointer to the allocated block, NULL if the block cannot
@@ -345,9 +345,9 @@ function av_malloc(size: cuint): pointer;
   cdecl; external av__util; {av_malloc_attrib av_alloc_size(1)}
 
 (**
- * Allocates or reallocates a block of memory.
- * If ptr is NULL and size > 0, allocates a new block. If 
- * size is zero, frees the memory block pointed to by ptr.
+ * Allocate or reallocate a block of memory.
+ * If ptr is NULL and size > 0, allocate a new block. If 
+ * size is zero, free the memory block pointed to by ptr.
  * @param size Size in bytes for the memory block to be allocated or
  * reallocated.
  * @param ptr Pointer to a memory block already allocated with
@@ -360,7 +360,7 @@ function av_realloc(ptr: pointer; size: cuint): pointer;
   cdecl; external av__util; {av_alloc_size(2)}
 
 (**
- * Frees a memory block which has been allocated with av_malloc(z)() or
+ * Free a memory block which has been allocated with av_malloc(z)() or
  * av_realloc().
  * @param ptr Pointer to the memory block which should be freed.
  * @note ptr = NULL is explicitly allowed.
@@ -371,7 +371,7 @@ procedure av_free(ptr: pointer);
   cdecl; external av__util;
 
 (**
- * Allocates a block of size bytes with alignment suitable for all
+ * Allocate a block of size bytes with alignment suitable for all
  * memory accesses (including vectors if available on the CPU) and
  * zeroes all the bytes of the block.
  * @param size Size in bytes for the memory block to be allocated.
@@ -382,7 +382,7 @@ function av_mallocz(size: cuint): pointer;
   cdecl; external av__util; {av_malloc_attrib av_alloc_size(1)}
 
 (**
- * Duplicates the string s.
+ * Duplicate the string s.
  * @param s string to be duplicated.
  * @return Pointer to a newly allocated string containing a
  * copy of s or NULL if the string cannot be allocated.
@@ -391,7 +391,7 @@ function av_strdup({const} s: PAnsiChar): PAnsiChar;
   cdecl; external av__util; {av_malloc_attrib}
 
 (**
- * Frees a memory block which has been allocated with av_malloc(z)() or
+ * Freesa memory block which has been allocated with av_malloc(z)() or
  * av_realloc() and set the pointer pointing to it to NULL.
  * @param ptr Pointer to the pointer to the memory block which should
  * be freed.
@@ -448,7 +448,7 @@ const
 {$IFEND}
 
 (**
- * Sends the specified message to the log if the level is less than or equal
+ * Send the specified message to the log if the level is less than or equal
  * to the current av_log_level. By default, all logging messages are sent to
  * stderr. This behavior can be altered by setting a different av_vlog callback
  * function.
-- 
cgit v1.2.3


From c7a5b08066575e72ba4f0cd12338f7df0c29c449 Mon Sep 17 00:00:00 2001
From: k-m_schindler <k-m_schindler@b956fd51-792f-4845-bead-9b4dfca2ff2c>
Date: Wed, 25 Aug 2010 03:14:18 +0000
Subject: update of avutil to 50.24.0

git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@2615 b956fd51-792f-4845-bead-9b4dfca2ff2c
---
 src/lib/ffmpeg/avutil.pas | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/lib/ffmpeg/avutil.pas')

diff --git a/src/lib/ffmpeg/avutil.pas b/src/lib/ffmpeg/avutil.pas
index ea3a1e29..2f8c79f7 100644
--- a/src/lib/ffmpeg/avutil.pas
+++ b/src/lib/ffmpeg/avutil.pas
@@ -25,7 +25,7 @@
  *
  * libavutil/avutil.h:
  *  Min. version: 49.0.1,  revision  6577, Sat Oct  7 15:30:46 2006 UTC
- *  Max. version: 50.21.0, revision 24190, Wed Jul 21 01:00:00 2010 CET
+ *  Max. version: 50.24.0, revision 24814, Wed Aug 25 05:00:00 2010 CET
  *
  * libavutil/mem.h:
  *  revision 23904, Wed Jul 21 01:00:00 2010 CET
@@ -92,7 +92,7 @@ const
    *)
   (* Max. supported version by this header *)
   LIBAVUTIL_MAX_VERSION_MAJOR   = 50;
-  LIBAVUTIL_MAX_VERSION_MINOR   = 21;
+  LIBAVUTIL_MAX_VERSION_MINOR   = 24;
   LIBAVUTIL_MAX_VERSION_RELEASE = 0;
   LIBAVUTIL_MAX_VERSION = (LIBAVUTIL_MAX_VERSION_MAJOR * VERSION_MAJOR) +
                           (LIBAVUTIL_MAX_VERSION_MINOR * VERSION_MINOR) +
-- 
cgit v1.2.3