diff options
| author | k-m_schindler <k-m_schindler@b956fd51-792f-4845-bead-9b4dfca2ff2c> | 2013-12-25 00:37:48 +0000 |
|---|---|---|
| committer | k-m_schindler <k-m_schindler@b956fd51-792f-4845-bead-9b4dfca2ff2c> | 2013-12-25 00:37:48 +0000 |
| commit | 0331a3797a3394ad03c8d7b40992b63f98018334 (patch) | |
| tree | 562f7566d325e8e598b28dfbf7ea8ab0bb02ffc4 /src/lib/ffmpeg-2.1/avutil.pas | |
| parent | df41226183b1e9496764d04b4c4fcdc116c3e59f (diff) | |
| download | usdx-0331a3797a3394ad03c8d7b40992b63f98018334.tar.gz usdx-0331a3797a3394ad03c8d7b40992b63f98018334.tar.xz usdx-0331a3797a3394ad03c8d7b40992b63f98018334.zip | |
fix compilation of avutil
git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@3051 b956fd51-792f-4845-bead-9b4dfca2ff2c
Diffstat (limited to '')
| -rw-r--r-- | src/lib/ffmpeg-2.1/avutil.pas | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/src/lib/ffmpeg-2.1/avutil.pas b/src/lib/ffmpeg-2.1/avutil.pas index eca5bf04..9be506f8 100644 --- a/src/lib/ffmpeg-2.1/avutil.pas +++ b/src/lib/ffmpeg-2.1/avutil.pas @@ -24,7 +24,7 @@ * Conversions of * * libavutil/avutil.h: - * version: 52.38.100 + * version: 52.48.100 * *) @@ -162,7 +162,7 @@ const * * AVPicture types, pixel formats and basic image planes manipulation. * - * @{ + * @ *) type @@ -223,12 +223,12 @@ function av_int_list_length({const} list: pointer; term: cuint64): cuint; {$INCLUDE libavutil/mem.pas} -{$INCLUDE libavutil/opt.pas} - {$INCLUDE libavutil/log.pas} {$INCLUDE libavutil/pixfmt.pas} +{$INCLUDE libavutil/opt.pas} + {$INCLUDE libavutil/samplefmt.pas} (* libavutil/common.h *) // until now MKTAG and MKBETAG is all from common.h KMS 19/5/2010 @@ -243,6 +243,9 @@ function MKBETAG(a, b, c, d: AnsiChar): integer; {$IFDEF HasInline}inline;{$ENDI implementation +uses + SysUtils; + function av_x_if_null(p: {const} pointer; x: {const} pointer): pointer; {$IFDEF HasInline}inline;{$ENDIF} begin if p = nil then |