aboutsummaryrefslogtreecommitdiffstats
path: root/Game/Code/lib/ffmpeg
diff options
context:
space:
mode:
authorjaybinks <jaybinks@b956fd51-792f-4845-bead-9b4dfca2ff2c>2007-10-11 10:50:01 +0000
committerjaybinks <jaybinks@b956fd51-792f-4845-bead-9b4dfca2ff2c>2007-10-11 10:50:01 +0000
commit0d997f8433e982584a0ab67a6d630d12f4314759 (patch)
treedc5ec28147f1b419d6513b5b30d253f905e9f966 /Game/Code/lib/ffmpeg
parent97a179d3ac5ce99d5e43406f2f66285576eefaf9 (diff)
downloadusdx-0d997f8433e982584a0ab67a6d630d12f4314759.tar.gz
usdx-0d997f8433e982584a0ab67a6d630d12f4314759.tar.xz
usdx-0d997f8433e982584a0ab67a6d630d12f4314759.zip
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
Diffstat (limited to 'Game/Code/lib/ffmpeg')
-rw-r--r--Game/Code/lib/ffmpeg/avcodec.pas21
-rw-r--r--Game/Code/lib/ffmpeg/avformat.pas26
-rw-r--r--Game/Code/lib/ffmpeg/avio.pas17
-rw-r--r--Game/Code/lib/ffmpeg/avutil.pas17
-rw-r--r--Game/Code/lib/ffmpeg/opt.pas17
-rw-r--r--Game/Code/lib/ffmpeg/rational.pas17
6 files changed, 81 insertions, 34 deletions
diff --git a/Game/Code/lib/ffmpeg/avcodec.pas b/Game/Code/lib/ffmpeg/avcodec.pas
index c82bc329..9c232fff 100644
--- a/Game/Code/lib/ffmpeg/avcodec.pas
+++ b/Game/Code/lib/ffmpeg/avcodec.pas
@@ -22,11 +22,13 @@ in the source codes *)
unit avcodec;
-{$LINKLIB libavutil}
-{$LINKLIB libavcodec}
-{$MODE DELPHI } (* CAT *)
-{$PACKENUM 4} (* every enum type variables uses 4 bytes, CAT *)
-{$PACKRECORDS C} (* GCC compatible, Record Packing, CAT *)
+{$IFDEF FPC}
+ {$LINKLIB libavutil}
+ {$LINKLIB libavcodec}
+ {$MODE DELPHI } (* CAT *)
+ {$PACKENUM 4} (* every enum type variables uses 4 bytes, CAT *)
+ {$PACKRECORDS C} (* GCC compatible, Record Packing, CAT *)
+{$ENDIF}
interface
@@ -34,8 +36,13 @@ uses
avutil, rational, opt; // CAT
const
-(* version numbers are changed by The Creative CAT *)
- av__format = 'libavformat.51';
+{$IFDEF win32}
+ av__format = 'avformat-50.dll';
+{$ELSE}
+ av__format = 'libavformat.so'; // .0d
+// av__format = 'libavformat.51';
+{$ENDIF}
+
LIBAVUTIL_VERSION_INT = ((51 shl 16) + (12 shl 8) + 1);
LIBAVUTIL_VERSION = '51.12.1';
diff --git a/Game/Code/lib/ffmpeg/avformat.pas b/Game/Code/lib/ffmpeg/avformat.pas
index 7fd009e9..26ff0d9b 100644
--- a/Game/Code/lib/ffmpeg/avformat.pas
+++ b/Game/Code/lib/ffmpeg/avformat.pas
@@ -22,19 +22,31 @@ in the source codes *)
unit avformat;
-{$LINKLIB libavutil}
-{$LINKLIB libavformat}
-{$MODE DELPHI } (* CAT *)
-{$PACKENUM 4} (* every enum type variables uses 4 bytes, CAT *)
-{$PACKRECORDS C} (* GCC compatible, Record Packing, CAT *)
+{$IFDEF FPC}
+ {$LINKLIB libavutil}
+ {$LINKLIB libavformat}
+ {$MODE DELPHI } (* CAT *)
+ {$PACKENUM 4} (* every enum type variables uses 4 bytes, CAT *)
+ {$PACKRECORDS C} (* GCC compatible, Record Packing, CAT *)
+{$ENDIF}
interface
uses
- avcodec, avio, rational, avutil; (* CAT *)
+ avcodec,
+ avio,
+ rational,
+ avutil; (* CAT *)
const
- av__format = 'libavformat.51'; (* CAT *)
+
+
+{$IFDEF win32}
+ av__format = 'avformat-50.dll';
+{$ELSE}
+ av__format = 'libavformat.so'; // .0d
+ //av__format = 'libavformat.51'; (* CAT *)
+{$ENDIF}
LIBAVUTIL_VERSION_INT = ((51 shl 16) + (12 shl 8) + 1);
LIBAVUTIL_VERSION = '51.12.1';
diff --git a/Game/Code/lib/ffmpeg/avio.pas b/Game/Code/lib/ffmpeg/avio.pas
index f1abea3e..5e40bd4e 100644
--- a/Game/Code/lib/ffmpeg/avio.pas
+++ b/Game/Code/lib/ffmpeg/avio.pas
@@ -22,15 +22,24 @@ For Mac OS X, some modifications were made by The Creative CAT, denoted as CAT
in the source codes *)
unit avio;
-{$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 (* Widows unit is deleted by CAT *)
const
(* version numbers are changed by The Creative CAT *)
- av__format = 'libavformat.51';
+
+{$IFDEF win32}
+ av__format = 'avformat-50.dll';
+{$ELSE}
+ av__format = 'libavformat.so'; // .0d
+//av__format = 'libavformat.51';
+{$ENDIF}
+
URL_RDONLY = 0;
URL_WRONLY = 1;
diff --git a/Game/Code/lib/ffmpeg/avutil.pas b/Game/Code/lib/ffmpeg/avutil.pas
index 5b5d6762..8d4fe2f7 100644
--- a/Game/Code/lib/ffmpeg/avutil.pas
+++ b/Game/Code/lib/ffmpeg/avutil.pas
@@ -20,15 +20,22 @@ For Mac OS X, some modifications were made by The Creative CAT, denoted as CAT
in the source codes *)
unit avutil;
-{$MODE DELPHI}
-{$PACKENUM 4} (* every enum type variables uses 4 bytes, CAT *)
-{$PACKRECORDS C} (* GCC compatible, Record Packing, CAT *)
+{$IFDEF FPC}
+ {$MODE DELPHI}
+ {$PACKENUM 4} (* every enum type variables uses 4 bytes, CAT *)
+ {$PACKRECORDS C} (* GCC compatible, Record Packing, CAT *)
+{$ENDIF}
interface
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}
+
LIBAVUTIL_VERSION_INT = ((49 shl 16) + (4 shl 8) + 1);
LIBAVUTIL_VERSION = '49.4.1';
diff --git a/Game/Code/lib/ffmpeg/opt.pas b/Game/Code/lib/ffmpeg/opt.pas
index 0acead1f..e70d77ad 100644
--- a/Game/Code/lib/ffmpeg/opt.pas
+++ b/Game/Code/lib/ffmpeg/opt.pas
@@ -21,9 +21,11 @@ For Mac OS X, some modifications were made by The Creative CAT, denoted as CAT
in the source codes *)
unit opt;
-{$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
@@ -43,8 +45,13 @@ type
);
const
-(* version numbers are changed by The Creative CAT *)
- av__codec = 'libavcodec.51';
+
+{$IFDEF win32}
+ av__codec = 'avcodec-51.dll';
+{$ELSE}
+ av__codec = 'avcodec.so'; // .0d
+ // av__codec = 'libavcodec.51';
+{$ENDIF}
AV_OPT_FLAG_ENCODING_PARAM = 1; ///< a generic parameter which can be set by the user for muxing or encoding
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
(*