diff options
Diffstat (limited to 'Game/Code/lib/ffmpeg')
-rw-r--r-- | Game/Code/lib/ffmpeg/avcodec.pas | 19 | ||||
-rw-r--r-- | Game/Code/lib/ffmpeg/avutil.pas | 10 |
2 files changed, 18 insertions, 11 deletions
diff --git a/Game/Code/lib/ffmpeg/avcodec.pas b/Game/Code/lib/ffmpeg/avcodec.pas index bcfe9809..4182b979 100644 --- a/Game/Code/lib/ffmpeg/avcodec.pas +++ b/Game/Code/lib/ffmpeg/avcodec.pas @@ -23,10 +23,11 @@ in the source codes *) unit avcodec;
{$IFDEF FPC}
- {$IFNDEF win32}
- {$LINKLIB libavutil}
- {$LINKLIB libavcodec}
+ {$IFDEF LINUX}
+ {$LINKLIB libavutil}
+ {$LINKLIB libavcodec}
{$ENDIF}
+
{$MODE DELPHI } (* CAT *)
{$PACKENUM 4} (* every enum type variables uses 4 bytes, CAT *)
{$PACKRECORDS C} (* GCC compatible, Record Packing, CAT *)
@@ -38,11 +39,15 @@ uses avutil, rational, opt; // CAT
const
-{$IFDEF win32}
+
+{$IFDEF MSWINDOWS}
av__format = 'avformat-50.dll';
-{$ELSE}
- av__format = 'libavformat.so'; // .0d
-// av__format = 'libavformat.51';
+{$ENDIF}
+{$IFDEF LINUX}
+ av__format = 'libavformat.so';
+{$ENDIF}
+{$IFDEF DARWIN}
+ av__format = 'libavformat.dylib';
{$ENDIF}
diff --git a/Game/Code/lib/ffmpeg/avutil.pas b/Game/Code/lib/ffmpeg/avutil.pas index 0a2078dc..ff833ad4 100644 --- a/Game/Code/lib/ffmpeg/avutil.pas +++ b/Game/Code/lib/ffmpeg/avutil.pas @@ -29,13 +29,15 @@ unit avutil; interface
const
-{$IFDEF win32}
+{$IFDEF MSWINDOWS}
av__util = 'avutil-49.dll';
-{$ELSE}
+{$ENDIF}
+{$IFDEF LINUX}
av__util = 'libavutil.so'; // .0d
-// av__util = 'libavutil.49';
{$ENDIF}
-
+{$IFDEF DARWIN}
+ av__util = 'libavutil.dylib';
+{$ENDIF}
LIBAVUTIL_VERSION_INT = ((49 shl 16) + (4 shl 8) + 1);
LIBAVUTIL_VERSION = '49.4.1';
|