diff options
| author | k-m_schindler <k-m_schindler@b956fd51-792f-4845-bead-9b4dfca2ff2c> | 2013-12-07 08:51:28 +0000 |
|---|---|---|
| committer | k-m_schindler <k-m_schindler@b956fd51-792f-4845-bead-9b4dfca2ff2c> | 2013-12-07 08:51:28 +0000 |
| commit | 19c1f1a71da3ffa5ab36af92eab1462f5f227bd6 (patch) | |
| tree | e96b868d4dc2d5f992e8098bde83e0ec78c170ff /src/lib/ffmpeg-1.2/avutil.pas | |
| parent | 7e3c91751340995157ee8a88f98a9bb823b93956 (diff) | |
| download | usdx-19c1f1a71da3ffa5ab36af92eab1462f5f227bd6.tar.gz usdx-19c1f1a71da3ffa5ab36af92eab1462f5f227bd6.tar.xz usdx-19c1f1a71da3ffa5ab36af92eab1462f5f227bd6.zip | |
Fixing ffmpeg-1.2, part 1
git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@3019 b956fd51-792f-4845-bead-9b4dfca2ff2c
Diffstat (limited to 'src/lib/ffmpeg-1.2/avutil.pas')
| -rw-r--r-- | src/lib/ffmpeg-1.2/avutil.pas | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/lib/ffmpeg-1.2/avutil.pas b/src/lib/ffmpeg-1.2/avutil.pas index b8440752..b3883ffa 100644 --- a/src/lib/ffmpeg-1.2/avutil.pas +++ b/src/lib/ffmpeg-1.2/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 @@ -256,6 +259,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 *) |