diff options
| author | tobigun <tobigun@b956fd51-792f-4845-bead-9b4dfca2ff2c> | 2008-01-11 03:26:05 +0000 |
|---|---|---|
| committer | tobigun <tobigun@b956fd51-792f-4845-bead-9b4dfca2ff2c> | 2008-01-11 03:26:05 +0000 |
| commit | 9ddb8c2b7c851d82922342ee8873267f0f1ae310 (patch) | |
| tree | 5bd532af8f9b468b312b0b21cbf4c38d69bae331 /Game/Code/lib/ffmpeg/avformat.pas | |
| parent | fc79f056741619c9432fe5f5e99f861e82705a2e (diff) | |
| download | usdx-9ddb8c2b7c851d82922342ee8873267f0f1ae310.tar.gz usdx-9ddb8c2b7c851d82922342ee8873267f0f1ae310.tar.xz usdx-9ddb8c2b7c851d82922342ee8873267f0f1ae310.zip | |
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
Diffstat (limited to 'Game/Code/lib/ffmpeg/avformat.pas')
| -rw-r--r-- | Game/Code/lib/ffmpeg/avformat.pas | 23 |
1 files changed, 7 insertions, 16 deletions
diff --git a/Game/Code/lib/ffmpeg/avformat.pas b/Game/Code/lib/ffmpeg/avformat.pas index 091b8fe0..174542b3 100644 --- a/Game/Code/lib/ffmpeg/avformat.pas +++ b/Game/Code/lib/ffmpeg/avformat.pas @@ -41,22 +41,9 @@ uses rational, avutil; (* CAT *) -const - -{$IFDEF MSWINDOWS} - av__format = 'avformat-50.dll'; -{$ENDIF} -{$IFDEF LINUX} - av__format = 'libavformat.so'; -{$ENDIF} -{$IFDEF DARWIN} - av__format = 'libavformat.dylib'; -{$ENDIF} - - LIBAVUTIL_VERSION_INT = ((51 shl 16) + (12 shl 8) + 1); - LIBAVUTIL_VERSION = '51.12.1'; - LIBAVUTIL_BUILD = LIBAVUTIL_VERSION_INT; +{$I version.inc} +const MAXINT64 = $7fffffffffffffff; MININT64 = $8000000000000000; @@ -315,8 +302,12 @@ type iformat: PAVInputFormat; oformat: PAVOutputFormat; priv_data: pointer; - + + {$IF (LIBAVFORMAT_VERSION >= 52)} pb: PByteIOContext; + {$ELSE} + pb: TByteIOContext; + {$IFEND} nb_streams: cardinal; (* CAT#3 *) streams: array [0..MAX_STREAMS - 1] of PAVStream; |