aboutsummaryrefslogtreecommitdiffstats
path: root/Game/Code/lib/ffmpeg
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--Game/Code/lib/ffmpeg/avformat.pas2
-rw-r--r--Game/Code/lib/ffmpeg/version.inc196
2 files changed, 99 insertions, 99 deletions
diff --git a/Game/Code/lib/ffmpeg/avformat.pas b/Game/Code/lib/ffmpeg/avformat.pas
index 174542b3..bcd7861c 100644
--- a/Game/Code/lib/ffmpeg/avformat.pas
+++ b/Game/Code/lib/ffmpeg/avformat.pas
@@ -303,7 +303,7 @@ type
oformat: PAVOutputFormat;
priv_data: pointer;
- {$IF (LIBAVFORMAT_VERSION >= 52)}
+ {$IF (LIBAVFORMAT_MAJOR_VERSION >= 52)}
pb: PByteIOContext;
{$ELSE}
pb: TByteIOContext;
diff --git a/Game/Code/lib/ffmpeg/version.inc b/Game/Code/lib/ffmpeg/version.inc
index 2944e643..e7f32f5a 100644
--- a/Game/Code/lib/ffmpeg/version.inc
+++ b/Game/Code/lib/ffmpeg/version.inc
@@ -1,102 +1,102 @@
const
{$IFDEF MSWINDOWS}
- av__codec = 'avcodec-51.dll';
- LIBAVCODEC_MAJOR_VERSION = 51;
- LIBAVCODEC_MINOR_VERSION = 0;
- LIBAVCODEC_SUB_VERSION = 0;
-
- av__format = 'avformat-50.dll';
- LIBAVFORMAT_MAJOR_VERSION = 50;
- LIBAVFORMAT_MINOR_VERSION = 0;
- LIBAVFORMAT_SUB_VERSION = 0;
-
- av__util = 'avutil-49.dll';
- LIBAVUTIL_MAJOR_VERSION = 49;
- LIBAVUTIL_MINOR_VERSION = 0;
- LIBAVUTIL_SUB_VERSION = 0;
-{$ENDIF}
-{$IFDEF LINUX}
- av__codec = 'libavcodec.so';
- LIBAVCODEC_MAJOR_VERSION = 51;
- LIBAVCODEC_MINOR_VERSION = 0;
- LIBAVCODEC_SUB_VERSION = 0;
-
- av__format = 'libavformat.so';
-//av__format = 'libavformat.51';
- LIBAVFORMAT_MAJOR_VERSION = 51;
- LIBAVFORMAT_MINOR_VERSION = 0;
- LIBAVFORMAT_SUB_VERSION = 0;
-
- av__util = 'libavutil.so';
- LIBAVUTIL_MAJOR_VERSION = 49;
- LIBAVUTIL_MINOR_VERSION = 0;
- LIBAVUTIL_SUB_VERSION = 0;
-{$ENDIF}
-{$IFDEF DARWIN}
- av__format = 'libavcodec.dylib';
- LIBAVCODEC_MAJOR_VERSION = 51;
- LIBAVCODEC_MINOR_VERSION = 0;
- LIBAVCODEC_SUB_VERSION = 0;
-
- av__format = 'libavformat.dylib';
- LIBAVFORMAT_MAJOR_VERSION = 52;
- LIBAVFORMAT_MINOR_VERSION = 0;
- LIBAVFORMAT_SUB_VERSION = 0;
-
- av__util = 'libavutil.dylib';
- LIBAVUTIL_MAJOR_VERSION = 49;
- LIBAVUTIL_MINOR_VERSION = 0;
- LIBAVUTIL_SUB_VERSION = 0;
-{$ENDIF}
-
-(* Max. supported version by this header *)
-(* TODO: someone has to check the changes up to version 52, add some IFDEFS and increase this version number *)
-
-LIBAVCODEC_MAX_MAJOR_VERSION = 51;
-LIBAVCODEC_MAX_MINOR_VERSION = 12;
-LIBAVCODEC_MAX_SUB_VERSION = 1;
-LIBAVCODEC_MAX_VERSION = LIBAVCODEC_MAX_MAJOR_VERSION +
- (LIBAVCODEC_MAX_MINOR_VERSION * 0.01) +
- (LIBAVCODEC_MAX_SUB_VERSION * 0.0001);
-
-LIBAVFORMAT_MAX_MAJOR_VERSION = 51;
-LIBAVFORMAT_MAX_MINOR_VERSION = 12;
-LIBAVFORMAT_MAX_SUB_VERSION = 1;
-LIBAVFORMAT_MAX_VERSION = LIBAVFORMAT_MAX_MAJOR_VERSION +
- (LIBAVFORMAT_MAX_MINOR_VERSION * 0.01) +
- (LIBAVFORMAT_MAX_SUB_VERSION * 0.0001);
-
-LIBAVUTIL_MAX_MAJOR_VERSION = 49;
-LIBAVUTIL_MAX_MINOR_VERSION = 4;
-LIBAVUTIL_MAX_SUB_VERSION = 1;
-LIBAVUTIL_MAX_VERSION = LIBAVUTIL_MAX_MAJOR_VERSION +
- (LIBAVUTIL_MAX_MINOR_VERSION * 0.01) +
- (LIBAVUTIL_MAX_SUB_VERSION * 0.0001);
-
-(* Calc linked version *)
-
-LIBAVCODEC_VERSION = LIBAVCODEC_MAJOR_VERSION +
- (LIBAVCODEC_MINOR_VERSION * 0.01) +
- (LIBAVCODEC_SUB_VERSION * 0.0001);
-
-LIBAVFORMAT_VERSION = LIBAVFORMAT_MAJOR_VERSION +
- (LIBAVFORMAT_MINOR_VERSION * 0.01) +
- (LIBAVFORMAT_SUB_VERSION * 0.0001);
-
-LIBAVUTIL_VERSION = LIBAVUTIL_MAJOR_VERSION +
- (LIBAVUTIL_MINOR_VERSION * 0.01) +
- (LIBAVUTIL_SUB_VERSION * 0.0001);
-
-(* Check if linked versions are supported *)
-
-{$IF (LIBAVCODEC_VERSION > LIBAVCODEC_MAX_VERSION)}
- {$MESSAGE Warn 'Linked version of libavcodec may be unsupported!'}
-{$IFEND}
-
-{$IF (LIBAVFORMAT_VERSION > LIBAVFORMAT_MAX_VERSION)}
- {$MESSAGE Warn 'Linked version of libavformat may be unsupported!'}
-{$IFEND}
+ av__codec = 'avcodec-51.dll';
+ LIBAVCODEC_MAJOR_VERSION = 51;
+ LIBAVCODEC_MINOR_VERSION = 0;
+ LIBAVCODEC_SUB_VERSION = 0;
+
+ av__format = 'avformat-50.dll';
+ LIBAVFORMAT_MAJOR_VERSION = 50;
+ LIBAVFORMAT_MINOR_VERSION = 0;
+ LIBAVFORMAT_SUB_VERSION = 0;
+
+ av__util = 'avutil-49.dll';
+ LIBAVUTIL_MAJOR_VERSION = 49;
+ LIBAVUTIL_MINOR_VERSION = 0;
+ LIBAVUTIL_SUB_VERSION = 0;
+{$ENDIF}
+{$IFDEF LINUX}
+ av__codec = 'libavcodec.so';
+ LIBAVCODEC_MAJOR_VERSION = 51;
+ LIBAVCODEC_MINOR_VERSION = 0;
+ LIBAVCODEC_SUB_VERSION = 0;
+
+ av__format = 'libavformat.so';
+//av__format = 'libavformat.51';
+ LIBAVFORMAT_MAJOR_VERSION = 51;
+ LIBAVFORMAT_MINOR_VERSION = 0;
+ LIBAVFORMAT_SUB_VERSION = 0;
+
+ av__util = 'libavutil.so';
+ LIBAVUTIL_MAJOR_VERSION = 49;
+ LIBAVUTIL_MINOR_VERSION = 0;
+ LIBAVUTIL_SUB_VERSION = 0;
+{$ENDIF}
+{$IFDEF DARWIN}
+ av__format = 'libavcodec.dylib';
+ LIBAVCODEC_MAJOR_VERSION = 51;
+ LIBAVCODEC_MINOR_VERSION = 0;
+ LIBAVCODEC_SUB_VERSION = 0;
+
+ av__format = 'libavformat.dylib';
+ LIBAVFORMAT_MAJOR_VERSION = 52;
+ LIBAVFORMAT_MINOR_VERSION = 0;
+ LIBAVFORMAT_SUB_VERSION = 0;
+
+ av__util = 'libavutil.dylib';
+ LIBAVUTIL_MAJOR_VERSION = 49;
+ LIBAVUTIL_MINOR_VERSION = 0;
+ LIBAVUTIL_SUB_VERSION = 0;
+{$ENDIF}
+
+(* Max. supported version by this header *)
+(* TODO: someone has to check the changes up to version 52, add some IFDEFS and increase this version number *)
+
+LIBAVCODEC_MAX_MAJOR_VERSION = 51;
+LIBAVCODEC_MAX_MINOR_VERSION = 12;
+LIBAVCODEC_MAX_SUB_VERSION = 1;
+LIBAVCODEC_MAX_VERSION = (LIBAVCODEC_MAX_MAJOR_VERSION * 10000) +
+ (LIBAVCODEC_MAX_MINOR_VERSION * 100) +
+ (LIBAVCODEC_MAX_SUB_VERSION);
+
+LIBAVFORMAT_MAX_MAJOR_VERSION = 51;
+LIBAVFORMAT_MAX_MINOR_VERSION = 12;
+LIBAVFORMAT_MAX_SUB_VERSION = 1;
+LIBAVFORMAT_MAX_VERSION = (LIBAVFORMAT_MAX_MAJOR_VERSION * 10000) +
+ (LIBAVFORMAT_MAX_MINOR_VERSION * 100) +
+ (LIBAVFORMAT_MAX_SUB_VERSION);
+
+LIBAVUTIL_MAX_MAJOR_VERSION = 49;
+LIBAVUTIL_MAX_MINOR_VERSION = 4;
+LIBAVUTIL_MAX_SUB_VERSION = 1;
+LIBAVUTIL_MAX_VERSION = (LIBAVUTIL_MAX_MAJOR_VERSION * 10000) +
+ (LIBAVUTIL_MAX_MINOR_VERSION * 100) +
+ (LIBAVUTIL_MAX_SUB_VERSION);
+
+(* Calc linked version *)
+LIBAVCODEC_VERSION = (LIBAVCODEC_MAJOR_VERSION * 10000) +
+ (LIBAVCODEC_MINOR_VERSION * 100) +
+ (LIBAVCODEC_SUB_VERSION);
+
+LIBAVFORMAT_VERSION = (LIBAVFORMAT_MAJOR_VERSION * 10000) +
+ (LIBAVFORMAT_MINOR_VERSION * 100) +
+ (LIBAVFORMAT_SUB_VERSION);
+
+LIBAVUTIL_VERSION = (LIBAVUTIL_MAJOR_VERSION * 10000) +
+ (LIBAVUTIL_MINOR_VERSION * 100) +
+ (LIBAVUTIL_SUB_VERSION);
+
+(* Check if linked versions are supported *)
+
+{$IF (LIBAVCODEC_VERSION > LIBAVCODEC_MAX_VERSION)}
+ {$MESSAGE Warn 'Linked version of libavcodec may be unsupported!'}
+{$IFEND}
+
+{$IF (LIBAVFORMAT_VERSION > LIBAVFORMAT_MAX_VERSION)}
+ {$MESSAGE Warn 'Linked version of libavformat may be unsupported!'}
+{$IFEND}
{$IF (LIBAVUTIL_VERSION > LIBAVUTIL_MAX_VERSION)}
- {$MESSAGE Warn 'Linked version of libavutil may be unsupported!'}
-{$IFEND}
+ {$MESSAGE Warn 'Linked version of libavutil may be unsupported!'}
+{$IFEND}
+
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-22 01:57:13 +0000