diff options
| author | k-m_schindler <k-m_schindler@b956fd51-792f-4845-bead-9b4dfca2ff2c> | 2012-04-22 00:06:06 +0000 |
|---|---|---|
| committer | k-m_schindler <k-m_schindler@b956fd51-792f-4845-bead-9b4dfca2ff2c> | 2012-04-22 00:06:06 +0000 |
| commit | c468a94188553bc1e2439767df65c3679cbca1f7 (patch) | |
| tree | 6830e92e6c7f8a19b24ffc7df7617893120ccc21 /src/lib/ffmpeg-0.10/libavutil | |
| parent | 56bef797506f7570090a3b144256e41185299408 (diff) | |
| download | usdx-c468a94188553bc1e2439767df65c3679cbca1f7.tar.gz usdx-c468a94188553bc1e2439767df65c3679cbca1f7.tar.xz usdx-c468a94188553bc1e2439767df65c3679cbca1f7.zip | |
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
Diffstat (limited to '')
| -rw-r--r-- | src/lib/ffmpeg-0.10/libavutil/cpu.pas | 2 | ||||
| -rw-r--r-- | src/lib/ffmpeg-0.10/libavutil/log.pas | 7 | ||||
| -rw-r--r-- | src/lib/ffmpeg-0.10/libavutil/mem.pas | 2 | ||||
| -rw-r--r-- | src/lib/ffmpeg-0.10/libavutil/pixfmt.pas | 4 | ||||
| -rw-r--r-- | src/lib/ffmpeg-0.10/libavutil/samplefmt.pas | 2 |
5 files changed, 9 insertions, 8 deletions
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 * *) |