create libavutil. Add and move include files.

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

10 files changed, 592 insertions, 95 deletions

diff --git a/src/lib/ffmpeg7/avutil.pas b/src/lib/ffmpeg7/avutil.pas
index 1b66b2e5..6dd0643f 100644
--- a/src/lib/ffmpeg7/avutil.pas
+++ b/src/lib/ffmpeg7/avutil.pas
@@ -49,8 +49,6 @@ interface
 
 uses
   ctypes,
-  mathematics,
-  opt,
   rational,
   {$IFDEF UNIX}
   BaseUnix,
@@ -154,19 +152,29 @@ type
 function av_get_picture_type_char(pict_type: TAVPictureType): Pchar;
   cdecl; external av__util;
 
-{$INCLUDE error.pas}
+{$INCLUDE libavutil/cpu.pas}
 
-{$INCLUDE pixfmt.pas}
+{$INCLUDE libavutil/dict.pas}
+
+{$INCLUDE libavutil/error.pas}
+
+{$INCLUDE libavutil/mathematics.pas}
+
+{$INCLUDE libavutil/mem.pas}
+
+{$INCLUDE libavutil/opt.pas}
+
+{$INCLUDE libavutil/log.pas}
+
+{$INCLUDE libavutil/pixfmt.pas}
+
+{$INCLUDE libavutil/samplefmt.pas}
 
 (* 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;
 
-{$INCLUDE mem.pas}
-
-{$INCLUDE log.pas}
-
 implementation
 
 (* libavutil/common.h *)
diff --git a/src/lib/ffmpeg7/libavutil/cpu.pas b/src/lib/ffmpeg7/libavutil/cpu.pas
new file mode 100644
index 00000000..56c04064
--- /dev/null
+++ b/src/lib/ffmpeg7/libavutil/cpu.pas
@@ -0,0 +1,71 @@
+(*
+ * This file is part of FFmpeg.
+ *
+ * FFmpeg is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * FFmpeg 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 FFmpeg; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ *
+ * This is a part of the Pascal port of ffmpeg.
+ * - Changes and updates by the UltraStar Deluxe Team
+ *
+ * Conversion of libavutil/cpu.h
+ * avutil version 50.43.0
+ *
+ *)
+
+(**
+ * @file
+ * CPU specific
+ *)
+
+const
+
+  AV_CPU_FLAG_FORCE         = $80000000; (* force usage of selected flags (OR) *)
+
+    (* lower 16 bits - CPU features *)
+  AV_CPU_FLAG_MMX           = $0001;     ///< standard MMX
+  AV_CPU_FLAG_MMX2          = $0002;     ///< SSE integer functions or AMD MMX ext
+  AV_CPU_FLAG_3DNOW         = $0004;     ///< AMD 3DNOW
+  AV_CPU_FLAG_SSE           = $0008;     ///< SSE functions
+  AV_CPU_FLAG_SSE2          = $0010;     ///< PIV SSE2 functions
+  AV_CPU_FLAG_SSE2SLOW      = $40000000; ///< SSE2 supported, but usually not faster
+  AV_CPU_FLAG_3DNOWEXT      = $0020;     ///< AMD 3DNowExt
+  AV_CPU_FLAG_SSE3          = $0040;     ///< Prescott SSE3 functions
+  AV_CPU_FLAG_SSE3SLOW      = $20000000; ///< SSE3 supported, but usually not faster
+  AV_CPU_FLAG_SSSE3         = $0080;     ///< Conroe SSSE3 functions
+  AV_CPU_FLAG_ATOM          = $10000000; ///< Atom processor, some SSSE3 instructions are slower
+  AV_CPU_FLAG_SSE4          = $0100;     ///< Penryn SSE4.1 functions
+  AV_CPU_FLAG_SSE42         = $0200;     ///< Nehalem SSE4.2 functions
+  AV_CPU_FLAG_AVX           = $4000;     ///< AVX functions: requires OS support even if YMM registers aren't used
+  AV_CPU_FLAG_IWMMXT        = $0100;     ///< XScale IWMMXT
+  AV_CPU_FLAG_ALTIVEC       = $0001;     ///< standard
+
+(**
+ * Return the flags which specify extensions supported by the CPU.
+ *)
+function av_get_cpu_flags(): cint;
+  cdecl; external av__util;
+
+(**
+ * Disables cpu detection and forces the specified flags.
+ *)
+procedure av_force_cpu_flags(flags: cint);
+  cdecl; external av__util;
+
+(* The following CPU-specific functions shall not be called directly. *)
+function ff_get_cpu_flags_arm(): cint;
+  cdecl; external av__util;
+function ff_get_cpu_flags_ppc(): cint;
+  cdecl; external av__util;
+function ff_get_cpu_flags_x86(): cint;
+  cdecl; external av__util;
diff --git a/src/lib/ffmpeg7/dict.pas b/src/lib/ffmpeg7/libavutil/dict.pas
index ec2e96da..6a924fd9 100644
--- a/src/lib/ffmpeg7/dict.pas
+++ b/src/lib/ffmpeg7/libavutil/dict.pas
@@ -23,22 +23,6 @@
  *
  *)
 
-unit dict;
-
-{$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}
-
-interface
-
-uses
-  ctypes,
-  UConfig;
-
 const
   AV_DICT_MATCH_CASE      = 1;
   AV_DICT_IGNORE_SUFFIX   = 2;
@@ -103,7 +87,3 @@ procedure av_dict_copy(var dst: PAVDictionary; src: PAVDictionary; flags: cint);
  *)
 procedure av_dict_free(var m: PAVDictionary);
   cdecl; external av__util;
-
-implementation
-
-end.
diff --git a/src/lib/ffmpeg7/error.pas b/src/lib/ffmpeg7/libavutil/error.pas
index 382f40bf..382f40bf 100644
--- a/src/lib/ffmpeg7/error.pas
+++ b/src/lib/ffmpeg7/libavutil/error.pas
diff --git a/src/lib/ffmpeg7/libavutil/log.pas b/src/lib/ffmpeg7/libavutil/log.pas
new file mode 100644
index 00000000..f2df66f0
--- /dev/null
+++ b/src/lib/ffmpeg7/libavutil/log.pas
@@ -0,0 +1,187 @@
+(*
+ * This file is part of FFmpeg.
+ *
+ * FFmpeg is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * FFmpeg 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 FFmpeg; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ *
+ * This is a part of the Pascal port of ffmpeg.
+ * - Changes and updates by the UltraStar Deluxe Team
+ *
+ * Conversion of libavutil/log.h
+ * avutil version 50.43.0
+ *
+ *)
+
+(**
+ * @file
+ * log
+ *)
+
+type
+(**
+ * Describe the class of an AVClass context structure. That is an
+ * arbitrary struct of which the first field is a pointer to an
+ * AVClass struct (e.g. AVCodecContext, AVFormatContext etc.).
+ *)
+  PAVClass = ^TAVClass;
+  TAVClass = record
+    (**
+     * The name of the class; usually it is the same name as the
+     * context structure type to which the AVClass is associated.
+     *)
+    class_name: PAnsiChar;
+
+    (**
+     * A pointer to a function which returns the name of a context
+     * instance ctx associated with the class.
+     *)
+    item_name: function(): PAnsiChar; cdecl;
+
+    (**
+     * a pointer to the first option specified in the class if any or NULL
+     *
+     * @see av_set_default_options()
+     *)
+    option: PAVOption;
+
+    (**
+     * LIBAVUTIL_VERSION with which this structure was created.
+     * This is used to allow fields to be added without requiring major
+     * version bumps everywhere.
+     *)
+    version: cint;
+
+    (**
+     * Offset in the structure where log_level_offset is stored.
+     * 0 means there is no such variable
+     *)
+    log_level_offset_offset: cint;
+
+    (**
+     * Offset in the structure where a pointer to the parent context for loging is stored.
+     * for example a decoder that uses eval.c could pass its AVCodecContext to eval as such
+     * parent context. And a av_log() implementation could then display the parent context
+     * can be NULL of course
+     *)
+    parent_log_context_offset: cint;
+    
+    (**
+     * A function for extended searching, e.g. in possible
+     * children objects.
+     *)
+    opt_find: function(): PAVOption; cdecl;
+  end;
+
+
+const
+  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.
+ * 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.
+ * However, not all future data is affected.
+ *)
+  AV_LOG_ERROR   = 16;
+
+(**
+ * 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;
+
+  AV_LOG_INFO    = 32;
+  AV_LOG_VERBOSE = 40;
+
+(**
+ * Stuff which is only useful for libav* developers.
+ *)
+  AV_LOG_DEBUG   = 48;
+
+(**
+ * 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.
+ *
+ * @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
+**}
+
+type
+  va_list = pointer;
+
+procedure av_vlog(avcl: pointer; level: cint; fmt: {const} PAnsiChar; dummy: va_list);
+  cdecl; external av__util;
+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);
+**}
+
+function av_default_item_name (ctx: pointer): PAnsiChar;
+  cdecl; external av__util;
+
+(**
+ * av_dlog macros
+ * Useful to print debug messages that shouldn't get compiled in normally.
+ *)
+(** to be translated if needed
+#ifdef DEBUG
+#    define av_dlog(pctx, ...) av_log(pctx, AV_LOG_DEBUG, __VA_ARGS__)
+#else
+#    define av_dlog(pctx, ...) do { if (0) av_log(pctx, AV_LOG_DEBUG, __VA_ARGS__); } while (0)
+#endif
+**)
+
+(**
+ * Skip repeated messages, this requires the user app to use av_log() instead of
+ * (f)printf as the 2 would otherwise interfere and lead to
+ * "Last message repeated x times" messages below (f)printf messages with some
+ * bad luck.
+ * Also to receive the last, "last repeated" line if any, the user app must
+ * call av_log(NULL, AV_LOG_QUIET, "%s", ""); at the end
+ *)
+const
+  AV_LOG_SKIP_REPEATED = 1;
+
+procedure av_log_set_flags(arg: cint);
+  cdecl; external av__util;
diff --git a/src/lib/ffmpeg7/mathematics.pas b/src/lib/ffmpeg7/libavutil/mathematics.pas
index 20ee21c2..85c7a3ac 100644
--- a/src/lib/ffmpeg7/mathematics.pas
+++ b/src/lib/ffmpeg7/libavutil/mathematics.pas
@@ -26,23 +26,6 @@
  *
  *)
 
-unit mathematics;
-
-{$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}
-
-interface
-
-uses
-  ctypes,
-  rational,
-  UConfig;
-
 const
   M_E          = 2.7182818284590452354;   // e
   M_LN2        = 0.69314718055994530942;  // log_e 2
@@ -113,7 +96,3 @@ function av_compare_ts(ts_a: cint64; tb_a: TAVRational; ts_b: cint64; tb_b: TAVR
  *)
 function av_compare_mod(a: cuint64; b: cuint64; modVar: cuint64): cint64;
   cdecl; external av__util;
-
-implementation
-
-end.
diff --git a/src/lib/ffmpeg7/libavutil/mem.pas b/src/lib/ffmpeg7/libavutil/mem.pas
new file mode 100644
index 00000000..b68dd310
--- /dev/null
+++ b/src/lib/ffmpeg7/libavutil/mem.pas
@@ -0,0 +1,111 @@
+(*
+ * This file is part of FFmpeg.
+ *
+ * FFmpeg is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * FFmpeg 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 FFmpeg; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ *
+ * This is a part of the Pascal port of ffmpeg.
+ * - Changes and updates by the UltraStar Deluxe Team
+ *
+ * Conversion of libavutil/mem.h
+ * avutil version 50.43.0
+ *
+ *)
+
+(**
+ * @file
+ * error code definitions
+ *)
+
+(* memory handling functions *)
+
+type
+  FF_INTERNAL_MEM_TYPE = cuint;
+  
+(**
+ * 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
+ * be allocated.
+ * @see av_mallocz()
+ *)
+function av_malloc(size: FF_INTERNAL_MEM_TYPE): pointer;
+  cdecl; external av__util; {av_malloc_attrib av_alloc_size(1)}
+
+(**
+ * 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
+ * av_malloc(z)() or av_realloc() or NULL.
+ * @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: FF_INTERNAL_MEM_TYPE): 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 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.
+ * @return Pointer to the allocated block, NULL if it cannot be allocated.
+ * @see av_malloc()
+ *)
+function av_mallocz(size: FF_INTERNAL_MEM_TYPE): pointer;
+  cdecl; external av__util; {av_malloc_attrib av_alloc_size(1)}
+
+(**
+ * 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.
+ *)
+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 the pointer pointing to it to NULL.
+ * @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;
+
+(**
+ * Add an element to a dynamic array.
+ *
+ * @param tab_ptr Pointer to the array.
+ * @param nb_ptr  Pointer to the number of elements in the array.
+ * @param elem    Element to be added.
+ *)
+procedure av_dynarray_add(tab_ptr: pointer; nb_ptr: PCint; elem: pointer);
+  cdecl; external av__util;
diff --git a/src/lib/ffmpeg7/opt.pas b/src/lib/ffmpeg7/libavutil/opt.pas
index a779056e..cea97763 100644
--- a/src/lib/ffmpeg7/opt.pas
+++ b/src/lib/ffmpeg7/libavutil/opt.pas
@@ -27,24 +27,6 @@
  *
  *)
 
-unit opt;
-
-{$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}
-
-interface
-
-uses
-  ctypes,
-  dict,
-  rational,
-  UConfig;
-
 type
   TAVOptionType = (
     FF_OPT_TYPE_FLAGS,
@@ -275,7 +257,3 @@ const
 function av_opt_find(obj: pointer; name: {const} PAnsiChar; unit_: {const} PAnsiChar;
                              opt_flags: cint; search_flags: cint): PAVOption;
   cdecl; external av__util;
-
-implementation
-
-end.
diff --git a/src/lib/ffmpeg7/libavutil/pixfmt.pas b/src/lib/ffmpeg7/libavutil/pixfmt.pas
new file mode 100644
index 00000000..82288cbb
--- /dev/null
+++ b/src/lib/ffmpeg7/libavutil/pixfmt.pas
@@ -0,0 +1,207 @@
+(*
+ * This file is part of FFmpeg.
+ *
+ * FFmpeg is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * FFmpeg 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 FFmpeg; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ *
+ * This is a part of the Pascal port of ffmpeg.
+ * - Changes and updates by the UltraStar Deluxe Team
+ *
+ * Conversion of libavutil/mem.h
+ * avutil version 50.43.0
+ *
+ *)
+
+(**
+ * @file
+ * Pixel format
+ *)
+
+type
+(**
+ * Pixel format. Notes:
+ *
+ * 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.
+ *
+ * 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], 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.
+ *
+ * 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;
+  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_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_GRAY8,     ///<        Y        ,  8bpp
+    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), deprecated in favor of PIX_FMT_YUV420P and setting color_range
+    PIX_FMT_YUVJ422P,  ///< planar YUV 4:2:2, 16bpp, full scale (JPEG), deprecated in favor of PIX_FMT_YUV422P and setting color_range
+    PIX_FMT_YUVJ444P,  ///< planar YUV 4:4:4, 24bpp, full scale (JPEG), deprecated in favor of PIX_FMT_YUV444P and setting color_range
+    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
+    PIX_FMT_BGR8,      ///< packed RGB 3:3:2,  8bpp, (msb)2B 3G 3R(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 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 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
+
+    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...
+
+    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), deprecated in favor of PIX_FMT_YUV440P and setting color_range
+    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_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
+
+    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
+
+    PIX_FMT_YUV420P16LE,  ///< planar YUV 4:2:0, 24bpp, (1 Cr & Cb sample per 2x2 Y samples), little-endian
+    PIX_FMT_YUV420P16BE,  ///< planar YUV 4:2:0, 24bpp, (1 Cr & Cb sample per 2x2 Y samples), big-endian
+    PIX_FMT_YUV422P16LE,  ///< planar YUV 4:2:2, 32bpp, (1 Cr & Cb sample per 2x1 Y samples), little-endian
+    PIX_FMT_YUV422P16BE,  ///< planar YUV 4:2:2, 32bpp, (1 Cr & Cb sample per 2x1 Y samples), big-endian
+    PIX_FMT_YUV444P16LE,  ///< planar YUV 4:4:4, 48bpp, (1 Cr & Cb sample per 1x1 Y samples), little-endian
+    PIX_FMT_YUV444P16BE,  ///< planar YUV 4:4:4, 48bpp, (1 Cr & Cb sample per 1x1 Y samples), big-endian
+    PIX_FMT_VDPAU_MPEG4,  ///< MPEG4 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_DXVA2_VLD,    ///< HW decoding through DXVA2, Picture.data[3] contains a LPDIRECT3DSURFACE9 pointer
+
+    PIX_FMT_RGB444LE,  ///< packed RGB 4:4:4, 16bpp, (msb)4A 4R 4G 4B(lsb), little-endian, most significant bits to 0
+    PIX_FMT_RGB444BE,  ///< packed RGB 4:4:4, 16bpp, (msb)4A 4R 4G 4B(lsb), big-endian, most significant bits to 0
+    PIX_FMT_BGR444LE,  ///< packed BGR 4:4:4, 16bpp, (msb)4A 4B 4G 4R(lsb), little-endian, most significant bits to 1
+    PIX_FMT_BGR444BE,  ///< packed BGR 4:4:4, 16bpp, (msb)4A 4B 4G 4R(lsb), big-endian, most significant bits to 1
+    PIX_FMT_GRAY8A,    ///< 8bit gray, 8bit alpha
+    PIX_FMT_BGR48BE,   ///< packed RGB 16:16:16, 48bpp, 16B, 16G, 16R, the 2-byte value for each R/G/B component is stored as big-endian
+    PIX_FMT_BGR48LE,   ///< packed RGB 16:16:16, 48bpp, 16B, 16G, 16R, the 2-byte value for each R/G/B component is stored as little-endian
+
+    //the following 10 formats have the disadvantage of needing 1 format for each bit depth, thus
+    //If you want to support multiple bit depths, then using PIX_FMT_YUV420P16* with the bpp stored seperately
+    //is better
+    PIX_FMT_YUV420P9BE, ///< planar YUV 4:2:0, 13.5bpp, (1 Cr & Cb sample per 2x2 Y samples), big-endian
+    PIX_FMT_YUV420P9LE, ///< planar YUV 4:2:0, 13.5bpp, (1 Cr & Cb sample per 2x2 Y samples), little-endian
+    PIX_FMT_YUV420P10BE,///< planar YUV 4:2:0, 15bpp, (1 Cr & Cb sample per 2x2 Y samples), big-endian
+    PIX_FMT_YUV420P10LE,///< planar YUV 4:2:0, 15bpp, (1 Cr & Cb sample per 2x2 Y samples), little-endian
+    PIX_FMT_YUV422P10BE,///< planar YUV 4:2:2, 20bpp, (1 Cr & Cb sample per 2x1 Y samples), little-endian
+    PIX_FMT_YUV422P10LE,///< planar YUV 4:2:2, 20bpp, (1 Cr & Cb sample per 2x1 Y samples), big-endian
+    PIX_FMT_YUV444P9BE, ///< planar YUV 4:4:4, 27bpp, (1 Cr & Cb sample per 1x1 Y samples), little-endian
+    PIX_FMT_YUV444P9LE, ///< planar YUV 4:4:4, 27bpp, (1 Cr & Cb sample per 1x1 Y samples), big-endian
+    PIX_FMT_YUV444P10BE,///< planar YUV 4:4:4, 30bpp, (1 Cr & Cb sample per 1x1 Y samples), little-endian
+    PIX_FMT_YUV444P10LE,///< planar YUV 4:4:4, 30bpp, (1 Cr & Cb sample per 1x1 Y samples), big-endian
+
+    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
+    PIX_FMT_Y400A   = PIX_FMT_GRAY8A;
+
+{$ifdef WORDS_BIGENDIAN}
+    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;
+
+    PIX_FMT_GRAY16  = PIX_FMT_GRAY16BE;
+    PIX_FMT_RGB48   = PIX_FMT_RGB48BE;
+    PIX_FMT_RGB565  = PIX_FMT_RGB565BE;
+    PIX_FMT_RGB555  = PIX_FMT_RGB555BE;
+    PIX_FMT_RGB444  = PIX_FMT_RGB444BE;
+    PIX_FMT_BGR48   = PIX_FMT_BGR48BE;
+    PIX_FMT_BGR565  = PIX_FMT_BGR565BE;
+    PIX_FMT_BGR555  = PIX_FMT_BGR555BE;
+    PIX_FMT_BGR444  = PIX_FMT_BGR444BE;
+
+    PIX_FMT_YUV420P9  = PIX_FMT_YUV420P9BE;
+    PIX_FMT_YUV444P9  = PIX_FMT_YUV444P9BE;
+    PIX_FMT_YUV420P10 = PIX_FMT_YUV420P10BE;
+    PIX_FMT_YUV422P10 = PIX_FMT_YUV422P10BE;
+    PIX_FMT_YUV444P10 = PIX_FMT_YUV444P10BE;
+    PIX_FMT_YUV420P16 = PIX_FMT_YUV420P16BE;
+    PIX_FMT_YUV422P16 = PIX_FMT_YUV422P16BE;
+    PIX_FMT_YUV444P16 = PIX_FMT_YUV444P16BE;
+{$else}
+    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;
+
+    PIX_FMT_GRAY16  = PIX_FMT_GRAY16LE;
+    PIX_FMT_RGB48   = PIX_FMT_RGB48LE;
+    PIX_FMT_RGB565  = PIX_FMT_RGB565LE;
+    PIX_FMT_RGB555  = PIX_FMT_RGB555LE;
+    PIX_FMT_RGB444  = PIX_FMT_RGB444LE;
+    PIX_FMT_BGR48   = PIX_FMT_BGR48LE;
+    PIX_FMT_BGR565  = PIX_FMT_BGR565LE;
+    PIX_FMT_BGR555  = PIX_FMT_BGR555LE;
+    PIX_FMT_BGR444  = PIX_FMT_BGR444LE;
+
+    PIX_FMT_YUV420P9  = PIX_FMT_YUV420P9LE;
+    PIX_FMT_YUV444P9  = PIX_FMT_YUV444P9LE;
+    PIX_FMT_YUV420P10 = PIX_FMT_YUV420P10LE;
+    PIX_FMT_YUV422P10 = PIX_FMT_YUV422P10LE;
+    PIX_FMT_YUV444P10 = PIX_FMT_YUV444P10LE;
+    PIX_FMT_YUV420P16 = PIX_FMT_YUV420P16LE;
+    PIX_FMT_YUV422P16 = PIX_FMT_YUV422P16LE;
+    PIX_FMT_YUV444P16 = PIX_FMT_YUV444P16LE;
+{$ENDIF}
diff --git a/src/lib/ffmpeg7/samplefmt.pas b/src/lib/ffmpeg7/libavutil/samplefmt.pas
index d4ddec5d..3335fa2d 100644
--- a/src/lib/ffmpeg7/samplefmt.pas
+++ b/src/lib/ffmpeg7/libavutil/samplefmt.pas
@@ -23,26 +23,6 @@
  *
  *)
 
-unit samplefmt;
-
-{$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}
-
-{$IFNDEF AVUTIL_SAMPLEFMT_H}
-  {$DEFINE AVUTIL_SAMPLEFMT_H}
-{$ENDIF}
-
-interface
-
-uses
-  ctypes,
-  UConfig;
-
 type
 (**
  * all in native-endian format
@@ -156,7 +136,3 @@ function av_samples_alloc(pointers: OctArrayOfPcuint8; linesizes: OctArrayOfcint
 			  sample_fmt: TAVSampleFormat; planar: cint;
 			  align: cint): cint;
   cdecl; external av__util;
-
-implementation
-
-end.