From 30343a531999b5e50673ee1731f1c54cbc008dfd Mon Sep 17 00:00:00 2001 From: jaybinks Date: Wed, 5 Sep 2007 12:02:06 +0000 Subject: added 3rd party dependencies ( except Jedi-SDL ) modified DPR to statically include all files needed (using relative paths) this means 3rd party components should not need installation in the IDE, or adding to search paths. git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@368 b956fd51-792f-4845-bead-9b4dfca2ff2c --- Game/Code/lib/ffmpeg/rational.pas | 88 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 88 insertions(+) create mode 100644 Game/Code/lib/ffmpeg/rational.pas (limited to 'Game/Code/lib/ffmpeg/rational.pas') diff --git a/Game/Code/lib/ffmpeg/rational.pas b/Game/Code/lib/ffmpeg/rational.pas new file mode 100644 index 00000000..a996e1df --- /dev/null +++ b/Game/Code/lib/ffmpeg/rational.pas @@ -0,0 +1,88 @@ +(* + * Rational numbers + * Copyright (c) 2003 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 + *) +unit rational; + +interface + +uses + windows; + +const + av__util = 'avutil-49.dll'; + +type + +(* + * Rational number num/den. *) + PAVRational = ^TAVRational; + TAVRational = record + num: integer; ///< numerator + den: integer; ///< denominator + end; + +(** + * returns 0 if a==b, 1 if a>b and -1 if a Date: Wed, 19 Sep 2007 23:34:09 +0000 Subject: tested ffmpeg in lazarus - linux.. working :) just need to make sure development packages are installed for ffmpeg. such as : libavcodec-dev & libavformat-dev git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@405 b956fd51-792f-4845-bead-9b4dfca2ff2c --- Game/Code/lib/ffmpeg/rational.pas | 184 ++++++++++++++++++++------------------ 1 file changed, 96 insertions(+), 88 deletions(-) (limited to 'Game/Code/lib/ffmpeg/rational.pas') diff --git a/Game/Code/lib/ffmpeg/rational.pas b/Game/Code/lib/ffmpeg/rational.pas index a996e1df..40d1f093 100644 --- a/Game/Code/lib/ffmpeg/rational.pas +++ b/Game/Code/lib/ffmpeg/rational.pas @@ -1,88 +1,96 @@ -(* - * Rational numbers - * Copyright (c) 2003 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 - *) -unit rational; - -interface - -uses - windows; - -const - av__util = 'avutil-49.dll'; - -type - -(* - * Rational number num/den. *) - PAVRational = ^TAVRational; - TAVRational = record - num: integer; ///< numerator - den: integer; ///< denominator - end; - -(** - * returns 0 if a==b, 1 if a>b and -1 if a + * + * 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 + *) +unit rational; + +interface + +{$IFDEF win32} +uses + windows; +{$endif} + +const + + {$IFDEF win32} + av__util = 'avutil-49.dll'; + {$ELSE} + av__util = 'libavutil.so'; // .0d + {$ENDIF} + + +type + +(* + * Rational number num/den. *) + PAVRational = ^TAVRational; + TAVRational = record + num: integer; ///< numerator + den: integer; ///< denominator + end; + +(** + * returns 0 if a==b, 1 if a>b and -1 if a Date: Thu, 11 Oct 2007 08:03:12 +0000 Subject: major changes to FFMPEG Headers so they now support linux. git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@500 b956fd51-792f-4845-bead-9b4dfca2ff2c --- Game/Code/lib/ffmpeg/rational.pas | 29 ++++++++++++----------------- 1 file changed, 12 insertions(+), 17 deletions(-) (limited to 'Game/Code/lib/ffmpeg/rational.pas') diff --git a/Game/Code/lib/ffmpeg/rational.pas b/Game/Code/lib/ffmpeg/rational.pas index 40d1f093..bd2cc94f 100644 --- a/Game/Code/lib/ffmpeg/rational.pas +++ b/Game/Code/lib/ffmpeg/rational.pas @@ -16,23 +16,20 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA *) -unit rational; +(* 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 *) -interface +unit rational; +{$MODE DELPHI} (* CAT *) +{$PACKENUM 4} (* every enum type variables uses 4 bytes, CAT *) +{$PACKRECORDS C} (* GCC compatible, Record Packing, CAT *) -{$IFDEF win32} -uses - windows; -{$endif} +interface (* unit windows is deleted by CAT *) const - - {$IFDEF win32} - av__util = 'avutil-49.dll'; - {$ELSE} - av__util = 'libavutil.so'; // .0d - {$ENDIF} - +(* version numbers are changed by The Creative CAT *) + av__util = 'libavutil.49'; type @@ -82,10 +79,8 @@ var begin tmp := a.num * b.den - b.num * a.den; - if tmp = 0 then - Result := (tmp shr 63) or 1 - else - Result := 0; + if tmp <> 0 then Result := (tmp shr 63) or 1 (* fixed by CAT *) + else Result := 0 end; function av_q2d(a: TAVRational): double; -- cgit v1.2.3 From 0d997f8433e982584a0ab67a6d630d12f4314759 Mon Sep 17 00:00:00 2001 From: jaybinks Date: Thu, 11 Oct 2007 10:50:01 +0000 Subject: fixes so codebase builds in delphi now, after major FFMpeg changse for linux. git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@503 b956fd51-792f-4845-bead-9b4dfca2ff2c --- Game/Code/lib/ffmpeg/rational.pas | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) (limited to 'Game/Code/lib/ffmpeg/rational.pas') diff --git a/Game/Code/lib/ffmpeg/rational.pas b/Game/Code/lib/ffmpeg/rational.pas index bd2cc94f..8fb3cbd8 100644 --- a/Game/Code/lib/ffmpeg/rational.pas +++ b/Game/Code/lib/ffmpeg/rational.pas @@ -21,16 +21,21 @@ For Mac OS X, some modifications were made by The Creative CAT, denoted as CAT in the source codes *) unit rational; -{$MODE DELPHI} (* CAT *) -{$PACKENUM 4} (* every enum type variables uses 4 bytes, CAT *) -{$PACKRECORDS C} (* GCC compatible, Record Packing, CAT *) +{$IFDEF FPC} + {$MODE DELPHI} (* CAT *) + {$PACKENUM 4} (* every enum type variables uses 4 bytes, CAT *) + {$PACKRECORDS C} (* GCC compatible, Record Packing, CAT *) +{$ENDIF} interface (* unit windows is deleted by CAT *) const -(* version numbers are changed by The Creative CAT *) - av__util = 'libavutil.49'; - + {$IFDEF win32} + av__util = 'avutil-49.dll'; + {$ELSE} + av__util = 'libavutil.so'; // .0d +// av__util = 'libavutil.49'; + {$ENDIF} type (* -- cgit v1.2.3 From 9ddb8c2b7c851d82922342ee8873267f0f1ae310 Mon Sep 17 00:00:00 2001 From: tobigun Date: Fri, 11 Jan 2008 03:26:05 +0000 Subject: there were some changes in the ffmpeg interface (for example TAVFormatContext's pb member is a pointer now). To better track version changes, version numbers of the dlls are now managed by the version.inc file. git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@779 b956fd51-792f-4845-bead-9b4dfca2ff2c --- Game/Code/lib/ffmpeg/rational.pas | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) (limited to 'Game/Code/lib/ffmpeg/rational.pas') diff --git a/Game/Code/lib/ffmpeg/rational.pas b/Game/Code/lib/ffmpeg/rational.pas index 8fb3cbd8..86dbf8a4 100644 --- a/Game/Code/lib/ffmpeg/rational.pas +++ b/Game/Code/lib/ffmpeg/rational.pas @@ -29,15 +29,9 @@ unit rational; interface (* unit windows is deleted by CAT *) -const - {$IFDEF win32} - av__util = 'avutil-49.dll'; - {$ELSE} - av__util = 'libavutil.so'; // .0d -// av__util = 'libavutil.49'; - {$ENDIF} -type +{$I version.inc} +type (* * Rational number num/den. *) PAVRational = ^TAVRational; -- cgit v1.2.3 From 89ac41a2ccb85d6dfccb501ff4877231cab72094 Mon Sep 17 00:00:00 2001 From: tobigun Date: Tue, 5 Feb 2008 13:43:38 +0000 Subject: Update of the ffmpeg headers to their current trunk versions. IMPORTANT: parameter of av_free_packet is a pointer now procedure av_free_packet (pkt: PAVPacket); as it is with av_free() and av_freep() git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@814 b956fd51-792f-4845-bead-9b4dfca2ff2c --- Game/Code/lib/ffmpeg/rational.pas | 92 +++++++++++++++++++++++++++++++-------- 1 file changed, 73 insertions(+), 19 deletions(-) (limited to 'Game/Code/lib/ffmpeg/rational.pas') diff --git a/Game/Code/lib/ffmpeg/rational.pas b/Game/Code/lib/ffmpeg/rational.pas index 86dbf8a4..14edb799 100644 --- a/Game/Code/lib/ffmpeg/rational.pas +++ b/Game/Code/lib/ffmpeg/rational.pas @@ -16,24 +16,33 @@ * 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 *) + +(* 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 *) + +// Revision: 10765 unit rational; + {$IFDEF FPC} - {$MODE DELPHI} (* CAT *) - {$PACKENUM 4} (* every enum type variables uses 4 bytes, CAT *) - {$PACKRECORDS C} (* GCC compatible, Record Packing, CAT *) + {$MODE DELPHI} + {$PACKENUM 4} (* use 4-byte enums *) + {$PACKRECORDS C} (* C/C++-compatible record packing *) +{$ELSE} + {$MINENUMSIZE 4} (* use 4-byte enums *) {$ENDIF} -interface (* unit windows is deleted by CAT *) +interface -{$I version.inc} +uses + UConfig; type (* - * Rational number num/den. *) + * Rational number num/den. + *) PAVRational = ^TAVRational; TAVRational = record num: integer; ///< numerator @@ -41,32 +50,75 @@ type end; (** - * returns 0 if a==b, 1 if a>b and -1 if ab and -1 if a 0 then Result := (tmp shr 63) or 1 (* fixed by CAT *) - else Result := 0 + if (tmp <> 0) then + Result := (tmp shr 63) or 1 + else + Result := 0 end; function av_q2d(a: TAVRational): double; -- cgit v1.2.3 From f49d49ac6af3f39a00e19ce314636520e1ae1faf Mon Sep 17 00:00:00 2001 From: tobigun Date: Thu, 7 Feb 2008 13:22:40 +0000 Subject: compatibility with the current svn-version git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@837 b956fd51-792f-4845-bead-9b4dfca2ff2c --- Game/Code/lib/ffmpeg/rational.pas | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'Game/Code/lib/ffmpeg/rational.pas') diff --git a/Game/Code/lib/ffmpeg/rational.pas b/Game/Code/lib/ffmpeg/rational.pas index 14edb799..0d6f76b6 100644 --- a/Game/Code/lib/ffmpeg/rational.pas +++ b/Game/Code/lib/ffmpeg/rational.pas @@ -22,7 +22,9 @@ * For Mac OS X, some modifications were made by The Creative CAT, denoted as CAT * in the source codes *) -// Revision: 10765 +(* + * Revision: 10765, Wed Oct 17 09:37:46 2007 UTC + *) unit rational; -- cgit v1.2.3