merge some changes from the 0.7 to 0.8 work

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

6 files changed, 22 insertions, 247 deletions

diff --git a/src/lib/ffmpeg-0.10/avutil.pas b/src/lib/ffmpeg-0.10/avutil.pas
index fe5e52c5..f50bef6e 100644
--- a/src/lib/ffmpeg-0.10/avutil.pas
+++ b/src/lib/ffmpeg-0.10/avutil.pas
@@ -26,14 +26,6 @@
  * libavutil/avutil.h:
  * version: 51.34.101
  *
- * 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,
@@ -195,239 +185,23 @@ function av_get_picture_type_char(pict_type: TAVPictureType): Pchar;
  *)
 function av_x_if_null(p: {const} pointer; x: {const} pointer): pointer;
 
-{$INCLUDE error.pas}
+{$INCLUDE libavutil/cpu.pas}
 
-(* libavutil/pixfmt.h version: 50.43.0 *)
+{$INCLUDE libavutil/dict.pas}
 
-type
-(**
- * Pixel format.
- *
- * @note
- * 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.
- *
- * @par
- * 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.
- *
- * @par
- * 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), big-endian
-    PIX_FMT_YUV422P10LE,///< planar YUV 4:2:2, 20bpp, (1 Cr & Cb sample per 2x1 Y samples), little-endian
-    PIX_FMT_YUV444P9BE, ///< planar YUV 4:4:4, 27bpp, (1 Cr & Cb sample per 1x1 Y samples), big-endian
-    PIX_FMT_YUV444P9LE, ///< planar YUV 4:4:4, 27bpp, (1 Cr & Cb sample per 1x1 Y samples), little-endian
-    PIX_FMT_YUV444P10BE,///< planar YUV 4:4:4, 30bpp, (1 Cr & Cb sample per 1x1 Y samples), big-endian
-    PIX_FMT_YUV444P10LE,///< planar YUV 4:4:4, 30bpp, (1 Cr & Cb sample per 1x1 Y samples), little-endian
-    PIX_FMT_YUV422P9BE, ///< planar YUV 4:2:2, 18bpp, (1 Cr & Cb sample per 2x1 Y samples), big-endian
-    PIX_FMT_YUV422P9LE, ///< planar YUV 4:2:2, 18bpp, (1 Cr & Cb sample per 2x1 Y samples), little-endian
-    PIX_FMT_VDA_VLD,    ///< hardware decoding through VDA
-
-{$ifdef AV_PIX_FMT_ABI_GIT_MASTER}
-    PIX_FMT_RGBA64BE,  ///< packed RGBA 16:16:16:16, 64bpp, 16R, 16G, 16B, 16A, the 2-byte value for each R/G/B/A component is stored as big-endian
-    PIX_FMT_RGBA64LE,  ///< packed RGBA 16:16:16:16, 64bpp, 16R, 16G, 16B, 16A, the 2-byte value for each R/G/B/A component is stored as little-endian
-    PIX_FMT_BGRA64BE,  ///< packed RGBA 16:16:16:16, 64bpp, 16B, 16G, 16R, 16A, the 2-byte value for each R/G/B/A component is stored as big-endian
-    PIX_FMT_BGRA64LE,  ///< packed RGBA 16:16:16:16, 64bpp, 16B, 16G, 16R, 16A, the 2-byte value for each R/G/B/A component is stored as little-endian
-{$endif}
-    PIX_FMT_GBRP,      ///< planar GBR 4:4:4 24bpp
-    PIX_FMT_GBRP9BE,   ///< planar GBR 4:4:4 27bpp, big endian
-    PIX_FMT_GBRP9LE,   ///< planar GBR 4:4:4 27bpp, little endian
-    PIX_FMT_GBRP10BE,  ///< planar GBR 4:4:4 30bpp, big endian
-    PIX_FMT_GBRP10LE,  ///< planar GBR 4:4:4 30bpp, little endian
-    PIX_FMT_GBRP16BE,  ///< planar GBR 4:4:4 48bpp, big endian
-    PIX_FMT_GBRP16LE,  ///< planar GBR 4:4:4 48bpp, little endian
-
-{$ifndef AV_PIX_FMT_ABI_GIT_MASTER}
-    PIX_FMT_RGBA64BE = $123,  ///< packed RGBA 16:16:16:16, 64bpp, 16R, 16G, 16B, 16A, the 2-byte value for each R/G/B/A component is stored as big-endian
-    PIX_FMT_RGBA64LE,  ///< packed RGBA 16:16:16:16, 64bpp, 16R, 16G, 16B, 16A, the 2-byte value for each R/G/B/A component is stored as little-endian
-    PIX_FMT_BGRA64BE,  ///< packed RGBA 16:16:16:16, 64bpp, 16B, 16G, 16R, 16A, the 2-byte value for each R/G/B/A component is stored as big-endian
-    PIX_FMT_BGRA64LE,  ///< packed RGBA 16:16:16:16, 64bpp, 16B, 16G, 16R, 16A, the 2-byte value for each R/G/B/A component is stored as little-endian
-{$endif}
-    PIX_FMT_0RGB = $123+4,      ///< packed RGB 8:8:8, 32bpp, 0RGB0RGB...
-    PIX_FMT_RGB0,      ///< packed RGB 8:8:8, 32bpp, RGB0RGB0...
-    PIX_FMT_0BGR,      ///< packed BGR 8:8:8, 32bpp, 0BGR0BGR...
-    PIX_FMT_BGR0,      ///< packed BGR 8:8:8, 32bpp, BGR0BGR0...
-    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
-  );
+{$INCLUDE libavutil/error.pas}
 
-const
-    PIX_FMT_Y400A   = PIX_FMT_GRAY8A;
-    PIX_FMT_GBR24P  = PIX_FMT_GBRP;
-
-{$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_0RGB32  = PIX_FMT_0RGB;
-    PIX_FMT_0BGR32  = PIX_FMT_0BGR;
-
-    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_YUV422P9  = PIX_FMT_YUV422P9BE;
-    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;
-
-    PIX_FMT_RGBA64    = PIX_FMT_RGBA64BE;
-    PIX_FMT_BGRA64    = PIX_FMT_BGRA64BE;
-    PIX_FMT_GBRP9     = PIX_FMT_GBRP9BE;
-    PIX_FMT_GBRP10    = PIX_FMT_GBRP10BE;
-    PIX_FMT_GBRP16    = PIX_FMT_GBRP16BE;
-
-{$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_0RGB32  = PIX_FMT_BGR0;
-    PIX_FMT_0BGR32  = PIX_FMT_RGB0;
-
-    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_YUV422P9  = PIX_FMT_YUV422P9LE;
-    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;
-
-    PIX_FMT_RGBA64    = PIX_FMT_RGBA64LE;
-    PIX_FMT_BGRA64    = PIX_FMT_BGRA64LE;
-    PIX_FMT_GBRP9     = PIX_FMT_GBRP9LE;
-    PIX_FMT_GBRP10    = PIX_FMT_GBRP10LE;
-    PIX_FMT_GBRP16    = PIX_FMT_GBRP16LE;
+{$INCLUDE libavutil/mathematics.pas}
 
-{$ENDIF}
+{$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
 
diff --git a/src/lib/ffmpeg-0.10/libavutil/cpu.pas b/src/lib/ffmpeg-0.10/libavutil/cpu.pas
index 56c04064..79c4fc92 100644
--- a/src/lib/ffmpeg-0.10/libavutil/cpu.pas
+++ b/src/lib/ffmpeg-0.10/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.34.101
  *
  *)
 
diff --git a/src/lib/ffmpeg-0.10/libavutil/log.pas b/src/lib/ffmpeg-0.10/libavutil/log.pas
index f2df66f0..015043ab 100644
--- a/src/lib/ffmpeg-0.10/libavutil/log.pas
+++ b/src/lib/ffmpeg-0.10/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.34.101
  *
  *)
 
@@ -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.10/libavutil/mem.pas b/src/lib/ffmpeg-0.10/libavutil/mem.pas
index b68dd310..5cc1dc1b 100644
--- a/src/lib/ffmpeg-0.10/libavutil/mem.pas
+++ b/src/lib/ffmpeg-0.10/libavutil/mem.pas
@@ -19,7 +19,7 @@
  * - Changes and updates by the UltraStar Deluxe Team
  *
  * Conversion of libavutil/mem.h
- * avutil version 50.43.0
+ * avutil version 51.34.101
  *
  *)
 
diff --git a/src/lib/ffmpeg-0.10/libavutil/pixfmt.pas b/src/lib/ffmpeg-0.10/libavutil/pixfmt.pas
index 82288cbb..22f91b7d 100644
--- a/src/lib/ffmpeg-0.10/libavutil/pixfmt.pas
+++ b/src/lib/ffmpeg-0.10/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.34.101
  *
  *)
 
diff --git a/src/lib/ffmpeg-0.10/libavutil/samplefmt.pas b/src/lib/ffmpeg-0.10/libavutil/samplefmt.pas
index 3335fa2d..5e1207d7 100644
--- a/src/lib/ffmpeg-0.10/libavutil/samplefmt.pas
+++ b/src/lib/ffmpeg-0.10/libavutil/samplefmt.pas
@@ -19,7 +19,7 @@
  * This is a part of the Pascal port of ffmpeg.
  *
  * Conversion of libavutil/samplefmt.h
- * avutil version 50.43.0
+ * avutil version 51.34.101
  *
  *)