diff options
| author | k-m_schindler <k-m_schindler@b956fd51-792f-4845-bead-9b4dfca2ff2c> | 2013-12-21 16:34:41 +0000 |
|---|---|---|
| committer | k-m_schindler <k-m_schindler@b956fd51-792f-4845-bead-9b4dfca2ff2c> | 2013-12-21 16:34:41 +0000 |
| commit | 7c86be938a4c7c9131625dc41a5990e426ca458a (patch) | |
| tree | 8d2ae44885847360cbfb76a5662d45601ff2c049 /src/lib/ffmpeg-1.1/avutil.pas | |
| parent | b782f20e916f664ed9f18b2191377159fffb1b07 (diff) | |
| download | usdx-7c86be938a4c7c9131625dc41a5990e426ca458a.tar.gz usdx-7c86be938a4c7c9131625dc41a5990e426ca458a.tar.xz usdx-7c86be938a4c7c9131625dc41a5990e426ca458a.zip | |
1st try to fix ffmpeg-1.1. thanks to brianf
git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@3040 b956fd51-792f-4845-bead-9b4dfca2ff2c
Diffstat (limited to 'src/lib/ffmpeg-1.1/avutil.pas')
| -rw-r--r-- | src/lib/ffmpeg-1.1/avutil.pas | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/lib/ffmpeg-1.1/avutil.pas b/src/lib/ffmpeg-1.1/avutil.pas index 5f21b695..5ea0231c 100644 --- a/src/lib/ffmpeg-1.1/avutil.pas +++ b/src/lib/ffmpeg-1.1/avutil.pas @@ -202,12 +202,12 @@ function av_x_if_null(p: {const} pointer; x: {const} pointer): pointer; {$IFDEF {$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 @@ -222,6 +222,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 @@ -272,6 +275,7 @@ var begin errbuf := stralloc(AV_ERROR_MAX_STRING_SIZE); av_make_error_string(errbuf, AV_ERROR_MAX_STRING_SIZE, errnum); + av_err2str := errbuf end; (* libavutil/mem.h *) |