From 1ba91d5a0e1df7419a561f6dcf16a0839509a5e7 Mon Sep 17 00:00:00 2001 From: k-m_schindler Date: Wed, 27 Aug 2008 13:28:57 +0000 Subject: Reordering of the directories[1]: moving Game/Code to src git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@1302 b956fd51-792f-4845-bead-9b4dfca2ff2c --- src/lib/ffmpeg/opt.pas | 198 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 198 insertions(+) create mode 100644 src/lib/ffmpeg/opt.pas (limited to 'src/lib/ffmpeg/opt.pas') diff --git a/src/lib/ffmpeg/opt.pas b/src/lib/ffmpeg/opt.pas new file mode 100644 index 00000000..bc46fbf2 --- /dev/null +++ b/src/lib/ffmpeg/opt.pas @@ -0,0 +1,198 @@ +(* + * AVOptions + * copyright (c) 2005 Michael Niedermayer + * + * This library 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 of the License, or (at your option) any later version. + * + * This library 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 this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + *) + +(* + * This is a part of Pascal porting of ffmpeg. + * - Originally by Victor Zinetz for Delphi and Free Pascal on Windows. + * - For Mac OS X, some modifications were made by The Creative CAT, denoted as CAT + * in the source codes. + * - Changes and updates by the UltraStar Deluxe Team + *) + +(* + * Conversion of libavcodec/opt.h + * revision 14436, Sun Jul 27 20:55:56 2008 UTC + *) + +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, + rational, + UConfig; + +type + TAVOptionType = ( + FF_OPT_TYPE_FLAGS, + FF_OPT_TYPE_INT, + FF_OPT_TYPE_INT64, + FF_OPT_TYPE_DOUBLE, + FF_OPT_TYPE_FLOAT, + FF_OPT_TYPE_STRING, + FF_OPT_TYPE_RATIONAL, + FF_OPT_TYPE_BINARY, ///< offset must point to a pointer immediately followed by an int for the length + FF_OPT_TYPE_CONST = 128 + ); + +const + AV_OPT_FLAG_ENCODING_PARAM = 1; ///< a generic parameter which can be set by the user for muxing or encoding + AV_OPT_FLAG_DECODING_PARAM = 2; ///< a generic parameter which can be set by the user for demuxing or decoding + AV_OPT_FLAG_METADATA = 4; ///< some data extracted or inserted into the file like title, comment, ... + AV_OPT_FLAG_AUDIO_PARAM = 8; + AV_OPT_FLAG_VIDEO_PARAM = 16; + AV_OPT_FLAG_SUBTITLE_PARAM = 32; + +type + (** + * AVOption + *) + PAVOption = ^TAVOption; + TAVOption = record + name: {const} PChar; + + (** + * short English help text + * @todo What about other languages? + *) + help: {const} PChar; + + (** + * The offset relative to the context structure where the option + * value is stored. It should be 0 for named constants. + *) + offset: cint; + type_: TAVOptionType; + + (** + * the default value for scalar options + *) + default_val: cdouble; + min: cdouble; ///< minimum valid value for the option + max: cdouble; ///< maximum valid value for the option + + flags: cint; +//FIXME think about enc-audio, ... style flags + + (** + * The logical unit to which the option belongs. Non-constant + * options and corresponding named constants share the same + * unit. May be NULL. + *) + unit_: {const} PChar; + end; + +{$IF LIBAVCODEC_VERSION >= 51039000} // 51.39.0 +(** + * Looks for an option in \p obj. Looks only for the options which + * have the flags set as specified in \p mask and \p flags (that is, + * for which it is the case that opt->flags & mask == flags). + * + * @param[in] obj a pointer to a struct whose first element is a + * pointer to an #AVClass + * @param[in] name the name of the option to look for + * @param[in] unit the unit of the option to look for, or any if NULL + * @return a pointer to the option found, or NULL if no option + * has been found + *) +function av_find_opt(obj: Pointer; {const} name: {const} PChar; {const} unit_: PChar; mask: cint; flags: cint): {const} PAVOption; + cdecl; external av__codec; +{$IFEND} + +(** + * @see av_set_string2() + *) +function av_set_string(obj: pointer; name: {const} pchar; val: {const} pchar): {const} PAVOption; + cdecl; external av__codec; deprecated; + +{$IF LIBAVCODEC_VERSION >= 51059000} // 51.59.0 +(** + * Sets the field of obj with the given name to value. + * + * @param[in] obj A struct whose first element is a pointer to an + * AVClass. + * @param[in] name the name of the field to set + * @param[in] val The value to set. If the field is not of a string + * type, then the given string is parsed. + * SI postfixes and some named scalars are supported. + * If the field is of a numeric type, it has to be a numeric or named + * scalar. Behavior with more than one scalar and +- infix operators + * is undefined. + * If the field is of a flags type, it has to be a sequence of numeric + * scalars or named flags separated by '+' or '-'. Prefixing a flag + * with '+' causes it to be set without affecting the other flags; + * similarly, '-' unsets a flag. + * @return a pointer to the AVOption corresponding to the field set or + * NULL if no matching AVOption exists, or if the value \p val is not + * valid + * @param alloc when 1 then the old value will be av_freed() and the + * new av_strduped() + * when 0 then no av_free() nor av_strdup() will be used + *) +function av_set_string2(obj: Pointer; name: {const} PChar; val: {const} PChar; alloc: cint): {const} PAVOption; + cdecl; external av__codec; +{$IFEND} + +function av_set_double(obj: pointer; name: {const} pchar; n: cdouble): PAVOption; + cdecl; external av__codec; + +function av_set_q(obj: pointer; name: {const} pchar; n: TAVRational): PAVOption; + cdecl; external av__codec; + +function av_set_int(obj: pointer; name: {const} pchar; n: cint64): PAVOption; + cdecl; external av__codec; + +function av_get_double(obj: pointer; name: {const} pchar; var o_out: PAVOption): cdouble; + cdecl; external av__codec; + +function av_get_q(obj: pointer; name: {const} pchar; var o_out: PAVOption): TAVRational; + cdecl; external av__codec; + +function av_get_int(obj: pointer; name: {const} pchar; var o_out: {const} PAVOption): cint64; + cdecl; external av__codec; + +function av_get_string(obj: pointer; name: {const} pchar; var o_out: {const} PAVOption; buf: pchar; buf_len: cint): pchar; + cdecl; external av__codec; + +function av_next_option(obj: pointer; last: {const} PAVOption): PAVOption; + cdecl; external av__codec; + +function av_opt_show(obj: pointer; av_log_obj: pointer): cint; + cdecl; external av__codec; + +procedure av_opt_set_defaults(s: pointer); + cdecl; external av__codec; + +{$IF LIBAVCODEC_VERSION >= 51039000} // 51.39.0 +procedure av_opt_set_defaults2(s: Pointer; mask: cint; flags: cint); + cdecl; external av__codec; +{$IFEND} + +implementation + +end. -- cgit v1.2.3 From 08a0ddf3d8f9eb819e03d9cd6c8d79bd8634fec6 Mon Sep 17 00:00:00 2001 From: tobigun Date: Wed, 1 Oct 2008 12:28:15 +0000 Subject: - FFmpeg header update - update to newest revision - if linked libs are too new, USDX will not compile anymore and display an error message (to avoid mysterious crashes if an unsupported version of FFmpeg is used) - comment change in UVisualizer.pas git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@1428 b956fd51-792f-4845-bead-9b4dfca2ff2c --- src/lib/ffmpeg/opt.pas | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/lib/ffmpeg/opt.pas') diff --git a/src/lib/ffmpeg/opt.pas b/src/lib/ffmpeg/opt.pas index bc46fbf2..e734aa9f 100644 --- a/src/lib/ffmpeg/opt.pas +++ b/src/lib/ffmpeg/opt.pas @@ -27,7 +27,7 @@ (* * Conversion of libavcodec/opt.h - * revision 14436, Sun Jul 27 20:55:56 2008 UTC + * revision 15120, Sun Aug 31 07:39:47 2008 UTC *) unit opt; -- cgit v1.2.3 From e24412a795e205494d0a7420fd582841c1fc1dd4 Mon Sep 17 00:00:00 2001 From: tobigun Date: Wed, 4 Feb 2009 17:17:51 +0000 Subject: ffmpeg header update git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@1581 b956fd51-792f-4845-bead-9b4dfca2ff2c --- src/lib/ffmpeg/opt.pas | 52 +++++++++++++++++++++++++++++++++----------------- 1 file changed, 34 insertions(+), 18 deletions(-) (limited to 'src/lib/ffmpeg/opt.pas') diff --git a/src/lib/ffmpeg/opt.pas b/src/lib/ffmpeg/opt.pas index e734aa9f..833dc247 100644 --- a/src/lib/ffmpeg/opt.pas +++ b/src/lib/ffmpeg/opt.pas @@ -27,7 +27,7 @@ (* * Conversion of libavcodec/opt.h - * revision 15120, Sun Aug 31 07:39:47 2008 UTC + * revision 16912, Sun Feb 1 02:00:19 2009 UTC *) unit opt; @@ -74,13 +74,13 @@ type *) PAVOption = ^TAVOption; TAVOption = record - name: {const} PChar; + name: {const} PAnsiChar; (** * short English help text * @todo What about other languages? *) - help: {const} PChar; + help: {const} PAnsiChar; (** * The offset relative to the context structure where the option @@ -104,7 +104,7 @@ type * options and corresponding named constants share the same * unit. May be NULL. *) - unit_: {const} PChar; + unit_: {const} PAnsiChar; end; {$IF LIBAVCODEC_VERSION >= 51039000} // 51.39.0 @@ -114,23 +114,38 @@ type * for which it is the case that opt->flags & mask == flags). * * @param[in] obj a pointer to a struct whose first element is a - * pointer to an #AVClass + * pointer to an AVClass * @param[in] name the name of the option to look for * @param[in] unit the unit of the option to look for, or any if NULL * @return a pointer to the option found, or NULL if no option * has been found *) -function av_find_opt(obj: Pointer; {const} name: {const} PChar; {const} unit_: PChar; mask: cint; flags: cint): {const} PAVOption; +function av_find_opt(obj: Pointer; {const} name: {const} PAnsiChar; {const} unit_: PAnsiChar; mask: cint; flags: cint): {const} PAVOption; cdecl; external av__codec; {$IFEND} +{$IF LIBAVCODEC_VERSION_MAJOR < 53} + (** * @see av_set_string2() *) -function av_set_string(obj: pointer; name: {const} pchar; val: {const} pchar): {const} PAVOption; +function av_set_string(obj: pointer; name: {const} PAnsiChar; val: {const} PAnsiChar): {const} PAVOption; cdecl; external av__codec; deprecated; {$IF LIBAVCODEC_VERSION >= 51059000} // 51.59.0 +(** + * @return a pointer to the AVOption corresponding to the field set or + * NULL if no matching AVOption exists, or if the value \p val is not + * valid + * @see av_set_string3() + *) +function av_set_string2(obj: Pointer; name: {const} PAnsiChar; val: {const} PAnsiChar; alloc: cint): {const} PAVOption; + cdecl; external av__codec; deprecated; +{$IFEND} + +{$IFEND} + +{$IF LIBAVCODEC_VERSION >= 52007000} // 52.7.0 (** * Sets the field of obj with the given name to value. * @@ -147,36 +162,37 @@ function av_set_string(obj: pointer; name: {const} pchar; val: {const} pchar): { * scalars or named flags separated by '+' or '-'. Prefixing a flag * with '+' causes it to be set without affecting the other flags; * similarly, '-' unsets a flag. - * @return a pointer to the AVOption corresponding to the field set or - * NULL if no matching AVOption exists, or if the value \p val is not - * valid + * @param[out] o_out if non-NULL put here a pointer to the AVOption + * found * @param alloc when 1 then the old value will be av_freed() and the * new av_strduped() * when 0 then no av_free() nor av_strdup() will be used + * @return 0 if the value has been set, an AVERROR* error code if no + * matching option exists, or if the value \p val is not valid *) -function av_set_string2(obj: Pointer; name: {const} PChar; val: {const} PChar; alloc: cint): {const} PAVOption; +function av_set_string3(obj: Pointer; name: {const} PAnsiChar; val: {const} PAnsiChar; alloc: cint; out o_out: {const} PAVOption): cint; cdecl; external av__codec; {$IFEND} -function av_set_double(obj: pointer; name: {const} pchar; n: cdouble): PAVOption; +function av_set_double(obj: pointer; name: {const} PAnsiChar; n: cdouble): PAVOption; cdecl; external av__codec; -function av_set_q(obj: pointer; name: {const} pchar; n: TAVRational): PAVOption; +function av_set_q(obj: pointer; name: {const} PAnsiChar; n: TAVRational): PAVOption; cdecl; external av__codec; -function av_set_int(obj: pointer; name: {const} pchar; n: cint64): PAVOption; +function av_set_int(obj: pointer; name: {const} PAnsiChar; n: cint64): PAVOption; cdecl; external av__codec; -function av_get_double(obj: pointer; name: {const} pchar; var o_out: PAVOption): cdouble; +function av_get_double(obj: pointer; name: {const} PAnsiChar; var o_out: PAVOption): cdouble; cdecl; external av__codec; -function av_get_q(obj: pointer; name: {const} pchar; var o_out: PAVOption): TAVRational; +function av_get_q(obj: pointer; name: {const} PAnsiChar; var o_out: PAVOption): TAVRational; cdecl; external av__codec; -function av_get_int(obj: pointer; name: {const} pchar; var o_out: {const} PAVOption): cint64; +function av_get_int(obj: pointer; name: {const} PAnsiChar; var o_out: {const} PAVOption): cint64; cdecl; external av__codec; -function av_get_string(obj: pointer; name: {const} pchar; var o_out: {const} PAVOption; buf: pchar; buf_len: cint): pchar; +function av_get_string(obj: pointer; name: {const} PAnsiChar; var o_out: {const} PAVOption; buf: PAnsiChar; buf_len: cint): PAnsiChar; cdecl; external av__codec; function av_next_option(obj: pointer; last: {const} PAVOption): PAVOption; -- cgit v1.2.3 From 8f33011473b758571d03b465020e85295e4fcda8 Mon Sep 17 00:00:00 2001 From: k-m_schindler Date: Fri, 12 Jun 2009 20:06:41 +0000 Subject: update check. no code change. git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@1813 b956fd51-792f-4845-bead-9b4dfca2ff2c --- src/lib/ffmpeg/opt.pas | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) (limited to 'src/lib/ffmpeg/opt.pas') diff --git a/src/lib/ffmpeg/opt.pas b/src/lib/ffmpeg/opt.pas index 833dc247..a2e2cce9 100644 --- a/src/lib/ffmpeg/opt.pas +++ b/src/lib/ffmpeg/opt.pas @@ -28,6 +28,9 @@ (* * Conversion of libavcodec/opt.h * revision 16912, Sun Feb 1 02:00:19 2009 UTC + * + * update, MiSchi, no code change + * Fri Jun 12 2009 21:50:00 UTC *) unit opt; @@ -109,8 +112,8 @@ type {$IF LIBAVCODEC_VERSION >= 51039000} // 51.39.0 (** - * Looks for an option in \p obj. Looks only for the options which - * have the flags set as specified in \p mask and \p flags (that is, + * Looks for an option in obj. Looks only for the options which + * have the flags set as specified in mask and flags (that is, * for which it is the case that opt->flags & mask == flags). * * @param[in] obj a pointer to a struct whose first element is a @@ -135,7 +138,7 @@ function av_set_string(obj: pointer; name: {const} PAnsiChar; val: {const} PAnsi {$IF LIBAVCODEC_VERSION >= 51059000} // 51.59.0 (** * @return a pointer to the AVOption corresponding to the field set or - * NULL if no matching AVOption exists, or if the value \p val is not + * NULL if no matching AVOption exists, or if the value val is not * valid * @see av_set_string3() *) @@ -167,8 +170,11 @@ function av_set_string2(obj: Pointer; name: {const} PAnsiChar; val: {const} PAns * @param alloc when 1 then the old value will be av_freed() and the * new av_strduped() * when 0 then no av_free() nor av_strdup() will be used - * @return 0 if the value has been set, an AVERROR* error code if no - * matching option exists, or if the value \p val is not valid + * @return 0 if the value has been set, or an AVERROR code in case of + * error: + * AVERROR(ENOENT) if no matching option exists + * AVERROR(ERANGE) if the value is out of range + * AVERROR(EINVAL) if the value is not valid *) function av_set_string3(obj: Pointer; name: {const} PAnsiChar; val: {const} PAnsiChar; alloc: cint; out o_out: {const} PAVOption): cint; cdecl; external av__codec; -- cgit v1.2.3 From 344cb2f6e8cc80ed82599178a28c3ff41b1a7f77 Mon Sep 17 00:00:00 2001 From: k-m_schindler Date: Sun, 6 Dec 2009 20:58:35 +0000 Subject: update to version 52.41.0. git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@1996 b956fd51-792f-4845-bead-9b4dfca2ff2c --- src/lib/ffmpeg/opt.pas | 59 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 59 insertions(+) (limited to 'src/lib/ffmpeg/opt.pas') diff --git a/src/lib/ffmpeg/opt.pas b/src/lib/ffmpeg/opt.pas index a2e2cce9..65e055ce 100644 --- a/src/lib/ffmpeg/opt.pas +++ b/src/lib/ffmpeg/opt.pas @@ -32,6 +32,11 @@ * update, MiSchi, no code change * Fri Jun 12 2009 21:50:00 UTC *) +{ + * update to + * Max. version: 52.42.0, Sun Dec 6 19:20:00 2009 CET + * MiSchi +} unit opt; @@ -110,6 +115,60 @@ type unit_: {const} PAnsiChar; end; +{$IF LIBAVCODEC_VERSION >= 52042000} // >= 52.42.0 +(** + * AVOption2. + * THIS IS NOT PART OF THE API/ABI YET! + * This is identical to AVOption except that default_val was replaced by + * an union, it should be compatible with AVOption on normal platforms. + *) +const + AV_OPT_FLAG_ENCODING_PARAM = 1; ///< a generic parameter which can be set by the user for muxing or encoding + AV_OPT_FLAG_DECODING_PARAM = 2; ///< a generic parameter which can be set by the user for demuxing or decoding + AV_OPT_FLAG_METADATA = 4; ///< some data extracted or inserted into the file like title, comment, ... + AV_OPT_FLAG_AUDIO_PARAM = 8; + AV_OPT_FLAG_VIDEO_PARAM = 16; + AV_OPT_FLAG_SUBTITLE_PARAM = 32; +type + PAVOption2 = ^TAVOption2; + TAVOption2 = record + name : {const} PAnsiChar; + + (** + * short English help text + * @todo What about other languages? + *) + help : {const} PAnsiChar; + + (** + * The offset relative to the context structure where the option + * value is stored. It should be 0 for named constants. + *) + offset : cint; + type_ : TAVOptionType; + + (** + * the default value for scalar options + *) + default_val : record + case cint of + 0 : (dbl: cdouble); + 1 : (str: PAnsiChar); + end; + min : cdouble; + max : cdouble; + flags : cint; +//FIXME think about enc-audio, ... style flags + + (** + * The logical unit to which the option belongs. Non-constant + * options and corresponding named constants share the same + * unit. May be NULL. + *) + unit_: {const} PAnsiChar; + end; +{$IFEND} + {$IF LIBAVCODEC_VERSION >= 51039000} // 51.39.0 (** * Looks for an option in obj. Looks only for the options which -- cgit v1.2.3 From fa95eab290da90e3a7d9f49f3be6f1fab96dbc26 Mon Sep 17 00:00:00 2001 From: k-m_schindler Date: Thu, 17 Dec 2009 20:56:40 +0000 Subject: remove duplicate declaration of constants for AVCODEC >= 52.42.0 git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@2047 b956fd51-792f-4845-bead-9b4dfca2ff2c --- src/lib/ffmpeg/opt.pas | 7 ------- 1 file changed, 7 deletions(-) (limited to 'src/lib/ffmpeg/opt.pas') diff --git a/src/lib/ffmpeg/opt.pas b/src/lib/ffmpeg/opt.pas index 65e055ce..86144598 100644 --- a/src/lib/ffmpeg/opt.pas +++ b/src/lib/ffmpeg/opt.pas @@ -122,13 +122,6 @@ type * This is identical to AVOption except that default_val was replaced by * an union, it should be compatible with AVOption on normal platforms. *) -const - AV_OPT_FLAG_ENCODING_PARAM = 1; ///< a generic parameter which can be set by the user for muxing or encoding - AV_OPT_FLAG_DECODING_PARAM = 2; ///< a generic parameter which can be set by the user for demuxing or decoding - AV_OPT_FLAG_METADATA = 4; ///< some data extracted or inserted into the file like title, comment, ... - AV_OPT_FLAG_AUDIO_PARAM = 8; - AV_OPT_FLAG_VIDEO_PARAM = 16; - AV_OPT_FLAG_SUBTITLE_PARAM = 32; type PAVOption2 = ^TAVOption2; TAVOption2 = record -- cgit v1.2.3 From d35aae71ead05b26b5e00b25de4f6ed11f11ad13 Mon Sep 17 00:00:00 2001 From: k-m_schindler Date: Mon, 4 Jan 2010 23:51:10 +0000 Subject: correction of some misplaced fields + some editorial changes + update to current git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@2067 b956fd51-792f-4845-bead-9b4dfca2ff2c --- src/lib/ffmpeg/opt.pas | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) (limited to 'src/lib/ffmpeg/opt.pas') diff --git a/src/lib/ffmpeg/opt.pas b/src/lib/ffmpeg/opt.pas index 86144598..726e57ce 100644 --- a/src/lib/ffmpeg/opt.pas +++ b/src/lib/ffmpeg/opt.pas @@ -23,18 +23,15 @@ * - For Mac OS X, some modifications were made by The Creative CAT, denoted as CAT * in the source codes. * - Changes and updates by the UltraStar Deluxe Team - *) - -(* + * * Conversion of libavcodec/opt.h * revision 16912, Sun Feb 1 02:00:19 2009 UTC * * update, MiSchi, no code change * Fri Jun 12 2009 21:50:00 UTC - *) -{ + * * update to - * Max. version: 52.42.0, Sun Dec 6 19:20:00 2009 CET + * Max. avcodec version: 52.45.0, Mon Jan 4 2010 19:20:00 CET * MiSchi } -- cgit v1.2.3 From 6688ce51e94517e13f99035c8214b2c5f05af79b Mon Sep 17 00:00:00 2001 From: k-m_schindler Date: Mon, 4 Jan 2010 23:54:10 +0000 Subject: correction of typo in previous commit. git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@2068 b956fd51-792f-4845-bead-9b4dfca2ff2c --- src/lib/ffmpeg/opt.pas | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/lib/ffmpeg/opt.pas') diff --git a/src/lib/ffmpeg/opt.pas b/src/lib/ffmpeg/opt.pas index 726e57ce..7b1105a4 100644 --- a/src/lib/ffmpeg/opt.pas +++ b/src/lib/ffmpeg/opt.pas @@ -33,7 +33,7 @@ * update to * Max. avcodec version: 52.45.0, Mon Jan 4 2010 19:20:00 CET * MiSchi -} + *) unit opt; -- cgit v1.2.3 From cd67b8888e7d19615ea014aec77228fee1ae77b1 Mon Sep 17 00:00:00 2001 From: k-m_schindler Date: Sun, 21 Feb 2010 00:27:17 +0000 Subject: update to 52.54.0 git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@2131 b956fd51-792f-4845-bead-9b4dfca2ff2c --- src/lib/ffmpeg/opt.pas | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'src/lib/ffmpeg/opt.pas') diff --git a/src/lib/ffmpeg/opt.pas b/src/lib/ffmpeg/opt.pas index 7b1105a4..585d2aae 100644 --- a/src/lib/ffmpeg/opt.pas +++ b/src/lib/ffmpeg/opt.pas @@ -33,7 +33,11 @@ * update to * Max. avcodec version: 52.45.0, Mon Jan 4 2010 19:20:00 CET * MiSchi - *) + * + * update, no code change + * Max. avcodec version: 52.54.0, Sun Feb 21 2010 19:20:00 CET + * MiSchi +*) unit opt; -- cgit v1.2.3 From e50553564bc39b8cd2996e52afb21c5b9bb39354 Mon Sep 17 00:00:00 2001 From: k-m_schindler Date: Sun, 21 Feb 2010 00:39:34 +0000 Subject: some cosmetics git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@2132 b956fd51-792f-4845-bead-9b4dfca2ff2c --- src/lib/ffmpeg/opt.pas | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/lib/ffmpeg/opt.pas') diff --git a/src/lib/ffmpeg/opt.pas b/src/lib/ffmpeg/opt.pas index 585d2aae..c84c0aae 100644 --- a/src/lib/ffmpeg/opt.pas +++ b/src/lib/ffmpeg/opt.pas @@ -242,10 +242,10 @@ function av_set_q(obj: pointer; name: {const} PAnsiChar; n: TAVRational): PAVOpt function av_set_int(obj: pointer; name: {const} PAnsiChar; n: cint64): PAVOption; cdecl; external av__codec; -function av_get_double(obj: pointer; name: {const} PAnsiChar; var o_out: PAVOption): cdouble; +function av_get_double(obj: pointer; name: {const} PAnsiChar; var o_out: {const} PAVOption): cdouble; cdecl; external av__codec; -function av_get_q(obj: pointer; name: {const} PAnsiChar; var o_out: PAVOption): TAVRational; +function av_get_q(obj: pointer; name: {const} PAnsiChar; var o_out: {const} PAVOption): TAVRational; cdecl; external av__codec; function av_get_int(obj: pointer; name: {const} PAnsiChar; var o_out: {const} PAVOption): cint64; -- cgit v1.2.3 From 7dc7833b8dd275a5c2fcc60cbcf1996f0a497d50 Mon Sep 17 00:00:00 2001 From: k-m_schindler Date: Tue, 11 May 2010 16:39:41 +0000 Subject: update avcodec.h and opt.h to 52.67.0 git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@2348 b956fd51-792f-4845-bead-9b4dfca2ff2c --- src/lib/ffmpeg/opt.pas | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) (limited to 'src/lib/ffmpeg/opt.pas') diff --git a/src/lib/ffmpeg/opt.pas b/src/lib/ffmpeg/opt.pas index c84c0aae..add45c88 100644 --- a/src/lib/ffmpeg/opt.pas +++ b/src/lib/ffmpeg/opt.pas @@ -25,19 +25,9 @@ * - Changes and updates by the UltraStar Deluxe Team * * Conversion of libavcodec/opt.h - * revision 16912, Sun Feb 1 02:00:19 2009 UTC + * revision 22921, Tue May 11 18:17 2010 CET * - * update, MiSchi, no code change - * Fri Jun 12 2009 21:50:00 UTC - * - * update to - * Max. avcodec version: 52.45.0, Mon Jan 4 2010 19:20:00 CET - * MiSchi - * - * update, no code change - * Max. avcodec version: 52.54.0, Sun Feb 21 2010 19:20:00 CET - * MiSchi -*) + *) unit opt; -- cgit v1.2.3 From 530f28ea5661ec541ef25bcb06d54ad34d77711b Mon Sep 17 00:00:00 2001 From: k-m_schindler Date: Tue, 11 May 2010 17:34:38 +0000 Subject: update avcodec.h and opt.h to 52.67.0 (correction) git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@2354 b956fd51-792f-4845-bead-9b4dfca2ff2c --- src/lib/ffmpeg/opt.pas | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/lib/ffmpeg/opt.pas') diff --git a/src/lib/ffmpeg/opt.pas b/src/lib/ffmpeg/opt.pas index add45c88..c755ed35 100644 --- a/src/lib/ffmpeg/opt.pas +++ b/src/lib/ffmpeg/opt.pas @@ -25,7 +25,7 @@ * - Changes and updates by the UltraStar Deluxe Team * * Conversion of libavcodec/opt.h - * revision 22921, Tue May 11 18:17 2010 CET + * Max. avcodec version: 52.67.0, revision 23057, Tue May 11 18:17 2010 CET * *) -- cgit v1.2.3 From 317797a84cb1a3fab3983173aee3953345c13d2e Mon Sep 17 00:00:00 2001 From: k-m_schindler Date: Sun, 30 May 2010 18:57:56 +0000 Subject: update to avcodec 52.72.0. also some cosmetics to opt.pas git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@2430 b956fd51-792f-4845-bead-9b4dfca2ff2c --- src/lib/ffmpeg/opt.pas | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'src/lib/ffmpeg/opt.pas') diff --git a/src/lib/ffmpeg/opt.pas b/src/lib/ffmpeg/opt.pas index c755ed35..0e73726f 100644 --- a/src/lib/ffmpeg/opt.pas +++ b/src/lib/ffmpeg/opt.pas @@ -15,9 +15,7 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - *) - -(* + * * This is a part of Pascal porting of ffmpeg. * - Originally by Victor Zinetz for Delphi and Free Pascal on Windows. * - For Mac OS X, some modifications were made by The Creative CAT, denoted as CAT @@ -25,7 +23,7 @@ * - Changes and updates by the UltraStar Deluxe Team * * Conversion of libavcodec/opt.h - * Max. avcodec version: 52.67.0, revision 23057, Tue May 11 18:17 2010 CET + * Max. avcodec version: 52.72.0, revision 23338, Sun May 30 20:55 2010 CET * *) -- cgit v1.2.3 From 56fb8460088c5a0217b26a396ce8752bc50b1ace Mon Sep 17 00:00:00 2001 From: k-m_schindler Date: Tue, 20 Jul 2010 21:47:32 +0000 Subject: update avcodec to 52.78.0 git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@2594 b956fd51-792f-4845-bead-9b4dfca2ff2c --- src/lib/ffmpeg/opt.pas | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/lib/ffmpeg/opt.pas') diff --git a/src/lib/ffmpeg/opt.pas b/src/lib/ffmpeg/opt.pas index 0e73726f..d5397e06 100644 --- a/src/lib/ffmpeg/opt.pas +++ b/src/lib/ffmpeg/opt.pas @@ -153,7 +153,7 @@ type {$IF LIBAVCODEC_VERSION >= 51039000} // 51.39.0 (** - * Looks for an option in obj. Looks only for the options which + * Look for an option in obj. Look only for the options which * have the flags set as specified in mask and flags (that is, * for which it is the case that opt->flags & mask == flags). * @@ -191,7 +191,7 @@ function av_set_string2(obj: Pointer; name: {const} PAnsiChar; val: {const} PAns {$IF LIBAVCODEC_VERSION >= 52007000} // 52.7.0 (** - * Sets the field of obj with the given name to value. + * Set the field of obj with the given name to value. * * @param[in] obj A struct whose first element is a pointer to an * AVClass. -- cgit v1.2.3 From 449df86de328677ab6ad50ca18ee8a3efb275b48 Mon Sep 17 00:00:00 2001 From: k-m_schindler Date: Wed, 25 Aug 2010 05:07:24 +0000 Subject: update of avcodec/opt to 52.86.1. No actual code cahange. git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@2620 b956fd51-792f-4845-bead-9b4dfca2ff2c --- src/lib/ffmpeg/opt.pas | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/lib/ffmpeg/opt.pas') diff --git a/src/lib/ffmpeg/opt.pas b/src/lib/ffmpeg/opt.pas index d5397e06..8669eaf6 100644 --- a/src/lib/ffmpeg/opt.pas +++ b/src/lib/ffmpeg/opt.pas @@ -23,7 +23,7 @@ * - Changes and updates by the UltraStar Deluxe Team * * Conversion of libavcodec/opt.h - * Max. avcodec version: 52.72.0, revision 23338, Sun May 30 20:55 2010 CET + * Max. avcodec version: 52.86.1, 24882, Wed Aug 23 07:00:00 2010 CET * *) -- cgit v1.2.3