check of avutil. avio, avformat and avcodec still to do.

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

5 files changed, 67 insertions, 438 deletions

diff --git a/src/lib/ffmpeg-0.8/avutil.pas b/src/lib/ffmpeg-0.8/avutil.pas
index 1fe72f67..29bec9e2 100644
--- a/src/lib/ffmpeg-0.8/avutil.pas
+++ b/src/lib/ffmpeg-0.8/avutil.pas
@@ -26,14 +26,6 @@
  * libavutil/avutil.h:
  * version: 51.9.1
  *
- * libavutil/mem.h:
- *
- * libavutil/log.h:
- *
- * 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;
@@ -54,8 +46,6 @@ interface
 
 uses
   ctypes,
-  mathematics,
-  opt,
   rational,
   {$IFDEF UNIX}
   BaseUnix,
@@ -150,432 +140,28 @@ type
 function av_get_picture_type_char(pict_type: TAVPictureType): Pchar;
   cdecl; external av__util;
 
-{$INCLUDE error.pas}
-
-(* libavutil/pixfmt.h version: 50.43.0 *)
-
-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}
-
-(* 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 *)
-
-(* memory handling functions *)
-
-(**
- * 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: size_t): 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: size_t): 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: size_t): 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;
-
-(* libavutil/log.h *)
-
-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;
+{$INCLUDE libavutil/cpu.pas}
 
-  AV_LOG_INFO    = 32;
-  AV_LOG_VERBOSE = 40;
+{$INCLUDE libavutil/dict.pas}
 
-(**
- * Stuff which is only useful for libav* developers.
- *)
-  AV_LOG_DEBUG   = 48;
+{$INCLUDE libavutil/error.pas}
 
-(**
- * 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
- *)
+{$INCLUDE libavutil/mathematics.pas}
 
-{** 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
-**}
+{$INCLUDE libavutil/mem.pas}
 
-type
-  va_list = pointer;
+{$INCLUDE libavutil/opt.pas}
 
-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;
+{$INCLUDE libavutil/log.pas}
 
-{** 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);
-**}
+{$INCLUDE libavutil/pixfmt.pas}
 
-function av_default_item_name (ctx: pointer): PAnsiChar;
-  cdecl; external av__util;
+{$INCLUDE libavutil/samplefmt.pas}
 
-(**
- * 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
-**)
+(* libavutil/common.h *) // until now MKTAG and MKBETAG is all from common.h KMS 19/5/2010
 
-(**
- * 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;
+function MKTAG  (a, b, c, d: AnsiChar): integer;
+function MKBETAG(a, b, c, d: AnsiChar): integer;
 
 implementation
 
diff --git a/src/lib/ffmpeg-0.8/libavutil/cpu.pas b/src/lib/ffmpeg-0.8/libavutil/cpu.pas
index 56c04064..e300d259 100644
--- a/src/lib/ffmpeg-0.8/libavutil/cpu.pas
+++ b/src/lib/ffmpeg-0.8/libavutil/cpu.pas
@@ -19,7 +19,7 @@
  * - Changes and updates by the UltraStar Deluxe Team
  *
  * Conversion of libavutil/cpu.h
- * avutil version 50.43.0
+ * avutil version 51.9.1
  *
  *)
 
diff --git a/src/lib/ffmpeg-0.8/libavutil/log.pas b/src/lib/ffmpeg-0.8/libavutil/log.pas
index f2df66f0..8060b0cb 100644
--- a/src/lib/ffmpeg-0.8/libavutil/log.pas
+++ b/src/lib/ffmpeg-0.8/libavutil/log.pas
@@ -19,7 +19,7 @@
  * - Changes and updates by the UltraStar Deluxe Team
  *
  * Conversion of libavutil/log.h
- * avutil version 50.43.0
+ * avutil version 51.9.1
  *
  *)
 
@@ -46,7 +46,7 @@ type
      * A pointer to a function which returns the name of a context
      * instance ctx associated with the class.
      *)
-    item_name: function(): PAnsiChar; cdecl;
+    item_name: function(ctx: pointer): PAnsiChar; cdecl;
 
     (**
      * a pointer to the first option specified in the class if any or NULL
@@ -80,7 +80,8 @@ type
      * A function for extended searching, e.g. in possible
      * children objects.
      *)
-    opt_find: function(): PAVOption; cdecl;
+    opt_find: function(obj: pointer; name: {const} PAnsiChar; unit: {const} PAnsiChar;
+                       opt_flags: cint; search_flags: cint): PAVOption; cdecl;
   end;
 
 
diff --git a/src/lib/ffmpeg-0.8/libavutil/mem.pas b/src/lib/ffmpeg-0.8/libavutil/mem.pas
index b68dd310..322a8657 100644
--- a/src/lib/ffmpeg-0.8/libavutil/mem.pas
+++ b/src/lib/ffmpeg-0.8/libavutil/mem.pas
@@ -29,9 +29,6 @@
  *)
 
 (* memory handling functions *)
-
-type
-  FF_INTERNAL_MEM_TYPE = cuint;
   
 (**
  * Allocate a block of size bytes with alignment suitable for all
@@ -41,7 +38,7 @@ type
  * be allocated.
  * @see av_mallocz()
  *)
-function av_malloc(size: FF_INTERNAL_MEM_TYPE): pointer;
+function av_malloc(size: size_t): pointer;
   cdecl; external av__util; {av_malloc_attrib av_alloc_size(1)}
 
 (**
@@ -56,10 +53,23 @@ function av_malloc(size: FF_INTERNAL_MEM_TYPE): pointer;
  * 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;
+function av_realloc(ptr: pointer; size: size_t): pointer;
   cdecl; external av__util; {av_alloc_size(2)}
 
 (**
+ * Allocate or reallocate a block of memory.
+ * This function does the same thing as av_realloc, except:
+ * - It takes two arguments and checks the result of the multiplication for
+ *   integer overflow.
+ * - It frees the input block in case of failure, thus avoiding the memory
+ *   leak with the classic "buf = realloc(buf); if (!buf) return -1;".
+ *)
+{ available only in 0.8.5 - 0.8.10
+function av_realloc_f(ptr: pointer; nelem: size_t; size: size_t): pointer;
+  cdecl; external av__util;
+}
+
+(**
  * 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.
@@ -78,10 +88,25 @@ procedure av_free(ptr: pointer);
  * @return Pointer to the allocated block, NULL if it cannot be allocated.
  * @see av_malloc()
  *)
-function av_mallocz(size: FF_INTERNAL_MEM_TYPE): pointer;
+function av_mallocz(size: size_t): pointer;
   cdecl; external av__util; {av_malloc_attrib av_alloc_size(1)}
 
 (**
+ * Allocate a block of nmemb * size bytes with alignment suitable for all
+ * memory accesses (including vectors if available on the CPU) and
+ * zero all the bytes of the block.
+ * The allocation will fail if nmemb * size is greater than or equal
+ * to INT_MAX.
+ * @param nmemb
+ * @param size
+ * @return Pointer to the allocated block, NULL if it cannot be allocated.
+ *)
+{ available only in 0.8.5 - 0.8.10
+function av_calloc(nmemb: size_t; size: size_t): pointer;
+  cdecl; external av__util; {av_malloc_attrib}
+}
+
+(**
  * Duplicate the string s.
  * @param s string to be duplicated.
  * @return Pointer to a newly allocated string containing a
@@ -109,3 +134,20 @@ procedure av_freep (ptr: pointer);
  *)
 procedure av_dynarray_add(tab_ptr: pointer; nb_ptr: PCint; elem: pointer);
   cdecl; external av__util;
+  
+(**
+ * Multiply two size_t values checking for overflow.
+ * @return  0 if success, AVERROR(EINVAL) if overflow.
+ *)
+{ available only in 0.8.5 - 0.8.10
+//static inline int av_size_mult(size_t a, size_t b, size_t *r)
+}
+{
+    size_t t = a * b;
+    /* Hack inspired from glibc: only try the division if nelem and elsize
+     * are both greater than sqrt(SIZE_MAX). */
+    if ((a | b) >= ((size_t)1 << (sizeof(size_t) * 4)) && a && t / a != b)
+        return AVERROR(EINVAL);
+    *r = t;
+    return 0;
+}
diff --git a/src/lib/ffmpeg-0.8/libavutil/pixfmt.pas b/src/lib/ffmpeg-0.8/libavutil/pixfmt.pas
index 82288cbb..552d4474 100644
--- a/src/lib/ffmpeg-0.8/libavutil/pixfmt.pas
+++ b/src/lib/ffmpeg-0.8/libavutil/pixfmt.pas
@@ -18,8 +18,8 @@
  * 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
+ * Conversion of libavutil/pixfmt.h
+ * avutil version 51.9.1
  *
  *)