From 2d2e572302584588bc6a05fb33efec13e37d7a7a Mon Sep 17 00:00:00 2001 From: k-m_schindler Date: Sun, 3 Mar 2013 01:23:38 +0000 Subject: first fix of ffmpeg-1.0 git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@2973 b956fd51-792f-4845-bead-9b4dfca2ff2c --- src/lib/ffmpeg-1.0/avutil.pas | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'src/lib/ffmpeg-1.0/avutil.pas') diff --git a/src/lib/ffmpeg-1.0/avutil.pas b/src/lib/ffmpeg-1.0/avutil.pas index d6152707..49d543cc 100644 --- a/src/lib/ffmpeg-1.0/avutil.pas +++ b/src/lib/ffmpeg-1.0/avutil.pas @@ -202,10 +202,10 @@ 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/opt.pas} + {$INCLUDE libavutil/pixfmt.pas} {$INCLUDE libavutil/samplefmt.pas} @@ -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 *) -- cgit v1.2.3