diff options
| author | k-m_schindler <k-m_schindler@b956fd51-792f-4845-bead-9b4dfca2ff2c> | 2012-05-04 08:49:55 +0000 |
|---|---|---|
| committer | k-m_schindler <k-m_schindler@b956fd51-792f-4845-bead-9b4dfca2ff2c> | 2012-05-04 08:49:55 +0000 |
| commit | 727e4c154e3c5e7789f633405b7561c0d7b1c780 (patch) | |
| tree | edd8fc48c78ff951e787ef44fdb8ece30e9c4bda /src/lib/ffmpeg-0.8/swscale.pas | |
| parent | 8d7de6a0515b5e2eca3179df4d76f48b1e0d2965 (diff) | |
| download | usdx-727e4c154e3c5e7789f633405b7561c0d7b1c780.tar.gz usdx-727e4c154e3c5e7789f633405b7561c0d7b1c780.tar.xz usdx-727e4c154e3c5e7789f633405b7561c0d7b1c780.zip | |
update of ffmpeg-0.8. it is probably 90% of what needs to be done.
git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@2871 b956fd51-792f-4845-bead-9b4dfca2ff2c
Diffstat (limited to '')
| -rw-r--r-- | src/lib/ffmpeg-0.8/swscale.pas | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/src/lib/ffmpeg-0.8/swscale.pas b/src/lib/ffmpeg-0.8/swscale.pas index 9806fc85..f9f53d8c 100644 --- a/src/lib/ffmpeg-0.8/swscale.pas +++ b/src/lib/ffmpeg-0.8/swscale.pas @@ -19,7 +19,7 @@ * - Ported by the UltraStar Deluxe Team * * Conversion of libswscale/swscale.h - * version: 0.14.1 + * version: 2.0.0 *) unit swscale; @@ -71,8 +71,8 @@ const * fix. *) (* Max. supported version by this header *) - LIBSWSCALE_MAX_VERSION_MAJOR = 0; - LIBSWSCALE_MAX_VERSION_MINOR = 11; + LIBSWSCALE_MAX_VERSION_MAJOR = 2; + LIBSWSCALE_MAX_VERSION_MINOR = 0; LIBSWSCALE_MAX_VERSION_RELEASE = 0; LIBSWSCALE_MAX_VERSION = (LIBSWSCALE_MAX_VERSION_MAJOR * VERSION_MAJOR) + (LIBSWSCALE_MAX_VERSION_MINOR * VERSION_MINOR) + @@ -296,7 +296,9 @@ function sws_scale(context: PSwsContext; {const} srcSlice: PPCuint8Array; {const cdecl; external sw__scale; {$if LIBSWSCALE_VERSION_MAJOR < 1} -// deprecated. Use sws_scale() instead. +(** + * @deprecated. Use sws_scale() instead. + *) function sws_scale_ordered(context: PSwsContext; {const} src: PPCuint8Array; srcStride: PCintArray; srcSliceY: cint; srcSliceH: cint; dst: PPCuint8Array; dstStride: PCintArray): cint; @@ -440,7 +442,7 @@ function sws_getCachedContext(context: PSwsContext; *) procedure sws_convertPalette8ToPacked32({const} src: PPCuint8Array; dst: PPCuint8Array; - num_pixels: clong; + num_pixels: cint; {const} palette: PPCuint8Array); cdecl; external sw__scale; @@ -456,7 +458,7 @@ procedure sws_convertPalette8ToPacked32({const} src: PPCuint8Array; *) procedure sws_convertPalette8ToPacked24({const} src: PPCuint8Array; dst: PPCuint8Array; - num_pixels: clong; + num_pixels: cint; {const} palette: PPCuint8Array); cdecl; external sw__scale; |